|
1 | 1 | only_allow_native_libs = false |
2 | 2 | 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 | + ) |
4 | 8 | # 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 |
5 | 9 | core_lib += { |
6 | 10 | 'compile_args': [core_lib.get('compile_args'), '-Wno-psabi'], |
@@ -116,9 +120,10 @@ fmt_use_header_only = false |
116 | 120 |
|
117 | 121 | if ( |
118 | 122 | 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' |
122 | 127 | ) |
123 | 128 | ) |
124 | 129 | fmt_use_header_only = true |
@@ -162,10 +167,18 @@ graphics_lib += { |
162 | 167 | 'deps': [graphics_lib.get('deps'), spdlog_dep], |
163 | 168 | } |
164 | 169 |
|
| 170 | +# TODO: solve this in teh spdlof meson.build, not here! |
165 | 171 | # 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 | +) |
167 | 177 | 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 | + ], |
169 | 182 | } |
170 | 183 | endif |
171 | 184 |
|
|
0 commit comments