|
1 | 1 | only_allow_native_libs = false |
2 | 2 |
|
3 | 3 | 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 | + ) |
5 | 9 | # 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 |
6 | 10 | core_lib += { |
7 | 11 | 'compile_args': [core_lib.get('compile_args'), '-Wno-psabi'], |
@@ -31,9 +35,10 @@ fmt_use_header_only = false |
31 | 35 |
|
32 | 36 | if ( |
33 | 37 | 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' |
37 | 42 | ) |
38 | 43 | ) |
39 | 44 | fmt_use_header_only = true |
@@ -229,8 +234,13 @@ if build_application |
229 | 234 | 'deps': [graphics_lib.get('deps'), spdlog_dep], |
230 | 235 | } |
231 | 236 |
|
| 237 | + # TODO: solve this in teh spdlog meson.build, not here! |
232 | 238 | # 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 | + ) |
234 | 244 | graphics_lib += { |
235 | 245 | 'compile_args': [ |
236 | 246 | graphics_lib.get('compile_args'), |
|
0 commit comments