Skip to content

Commit 8882648

Browse files
committed
WII:
- fix meta.xml - add spdlog patch to wii
1 parent d112464 commit 8882648

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

platforms/wii/meta.xml.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<app version="1">
2+
<app version="1.0">
33
<name>@OOPETRIS_NAME@</name>
44
<coder>@OOPETRIS_AUTHOR@</coder>
55
<version>@OOPETRIS_VERSION@</version>
66
<short_description>@OOPETRIS_SHORT_DESCRIPTION@</short_description>
77
<long_description>@OOPETRIS_LONG_DESCRIPTION@</long_description>
88
<no_ios_reload/>
9+
<ahb_access/>
910
</app>

tools/dependencies/meson.build

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
only_allow_native_libs = false
22
if meson.is_cross_build()
3-
if host_machine.system() == 'switch' or host_machine.system() == '3ds' or host_machine.system() == 'wii'
3+
if (
4+
host_machine.system() == 'switch'
5+
or host_machine.system() == '3ds'
6+
or host_machine.system() == 'wii'
7+
)
48
# we do not link to code that was compiled with gcc 10.1 / gcc 7.1, the code we link with is all compiled with gcc 13.2
59
core_lib += {
610
'compile_args': [core_lib.get('compile_args'), '-Wno-psabi'],
@@ -116,9 +120,10 @@ fmt_use_header_only = false
116120

117121
if (
118122
meson.is_cross_build()
119-
and (host_machine.system() == 'switch'
120-
or host_machine.system() == '3ds'
121-
or host_machine.system() == 'wii'
123+
and (
124+
host_machine.system() == 'switch'
125+
or host_machine.system() == '3ds'
126+
or host_machine.system() == 'wii'
122127
)
123128
)
124129
fmt_use_header_only = true
@@ -162,10 +167,18 @@ graphics_lib += {
162167
'deps': [graphics_lib.get('deps'), spdlog_dep],
163168
}
164169

170+
# TODO: solve this in teh spdlof meson.build, not here!
165171
# on the 3ds there is no thread local storage (TLS)
166-
if (meson.is_cross_build() and host_machine.system() == '3ds')
172+
if (
173+
meson.is_cross_build()
174+
and (host_machine.system() == '3ds'
175+
or host_machine.system() == 'wii')
176+
)
167177
graphics_lib += {
168-
'compile_args': [graphics_lib.get('compile_args'), '-DSPDLOG_NO_TLS'],
178+
'compile_args': [
179+
graphics_lib.get('compile_args'),
180+
'-DSPDLOG_NO_TLS'
181+
],
169182
}
170183
endif
171184

0 commit comments

Comments
 (0)