Skip to content

Commit f0d9a66

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

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
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: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
only_allow_native_libs = false
22

33
if meson.is_cross_build()
4-
if host_machine.system() == 'switch' or host_machine.system() == '3ds' or host_machine.system() == 'wii'
4+
if (
5+
host_machine.system() == 'switch'
6+
or host_machine.system() == '3ds'
7+
or host_machine.system() == 'wii'
8+
)
59
# 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
610
core_lib += {
711
'compile_args': [core_lib.get('compile_args'), '-Wno-psabi'],
@@ -31,9 +35,10 @@ fmt_use_header_only = false
3135

3236
if (
3337
meson.is_cross_build()
34-
and (host_machine.system() == 'switch'
35-
or host_machine.system() == '3ds'
36-
or host_machine.system() == 'wii'
38+
and (
39+
host_machine.system() == 'switch'
40+
or host_machine.system() == '3ds'
41+
or host_machine.system() == 'wii'
3742
)
3843
)
3944
fmt_use_header_only = true
@@ -229,8 +234,13 @@ if build_application
229234
'deps': [graphics_lib.get('deps'), spdlog_dep],
230235
}
231236

237+
# TODO: solve this in teh spdlog meson.build, not here!
232238
# on the 3ds there is no thread local storage (TLS)
233-
if (meson.is_cross_build() and host_machine.system() == '3ds')
239+
if (
240+
meson.is_cross_build()
241+
and (host_machine.system() == '3ds'
242+
or host_machine.system() == 'wii')
243+
)
234244
graphics_lib += {
235245
'compile_args': [
236246
graphics_lib.get('compile_args'),

0 commit comments

Comments
 (0)