meson: fix cross build setup, report unknown systems

Author: Totto16

meson.build

@@ -25,32 +25,36 @@ subdir('src')
 
 subdir('tools/install')
 
-if meson.is_cross_build() and host_machine.system() == 'android'
-
-    library(
-        'oopetris',
-        main_files,
-        dependencies: [liboopetris_graphics_dep, graphic_application_deps],
-        override_options: {
-            'warning_level': '3',
-            'werror': true,
-        },
-    )
-
-elif meson.is_cross_build() and host_machine.system() == 'switch'
-    switch_options = [
-        app_name,
-        main_files,
-        [liboopetris_graphics_dep, graphic_application_deps],
-    ]
-    subdir('platforms/switch')
-elif meson.is_cross_build() and host_machine.system() == '3ds'
-    _3ds_options = [
-        app_name,
-        main_files,
-        [liboopetris_graphics_dep, graphic_application_deps],
-    ]
-    subdir('platforms/3ds')
+if meson.is_cross_build()
+    if host_machine.system() == 'android'
+
+        library(
+            'oopetris',
+            main_files,
+            dependencies: [liboopetris_graphics_dep, graphic_application_deps],
+            override_options: {
+                'warning_level': '3',
+                'werror': true,
+            },
+        )
+
+    elif host_machine.system() == 'switch'
+        switch_options = [
+            app_name,
+            main_files,
+            [liboopetris_graphics_dep, graphic_application_deps],
+        ]
+        subdir('platforms/switch')
+    elif host_machine.system() == '3ds'
+        _3ds_options = [
+            app_name,
+            main_files,
+            [liboopetris_graphics_dep, graphic_application_deps],
+        ]
+        subdir('platforms/3ds')
+    else
+        error('not supported platform: ' + host_machine.system())
+    endif
 else
 
     if host_machine.system() == 'windows'
@@ -86,7 +90,9 @@ else
 
             makensis = find_program('makensis')
 
-            nsis_script = meson.project_source_root() / 'tools' / 'installer' / 'setup.nsi'
+            nsis_script = (
+                meson.project_source_root() / 'tools' / 'installer' / 'setup.nsi'
+            )
 
             run_target(
                 'windows_installer',

tools/dependencies/meson.build

@@ -116,7 +116,8 @@ fmt_use_header_only = false
 
 if (
     meson.is_cross_build()
-    and (host_machine.system() == 'switch' or host_machine.system() == '3ds')
+    and (host_machine.system() == 'switch'
+    or host_machine.system() == '3ds')
 )
     fmt_use_header_only = true
     # clang with libc++ creates some really long and confusing linker errors, so just use the header only library
@@ -147,6 +148,7 @@ graphics_lib += {
     'deps': [graphics_lib.get('deps'), spdlog_dep],
 }
 
+# on the 3ds there is no thread local storage (TLS)
 if (meson.is_cross_build() and host_machine.system() == '3ds')
     graphics_lib += {
         'compile_args': [graphics_lib.get('compile_args'), '-DSPDLOG_NO_TLS'],
@@ -220,7 +222,8 @@ online_multiplayer_supported = true
 
 if (
     meson.is_cross_build()
-    and (host_machine.system() == 'switch' or host_machine.system() == '3ds')
+    and (host_machine.system() == 'switch'
+    or host_machine.system() == '3ds')
 )
     online_multiplayer_supported = false
 
@@ -261,8 +264,8 @@ is_flatpak_build = false
 if build_installer
     if get_option('buildtype') != 'release'
         error(
-            'buildtype needs to be \'release\', when building the installer, but was: '
-            + get_option('buildtype'),
+            'buildtype needs to be \'release\', when building the installer, but was: ' +
+            get_option('buildtype'),
         )
     endif
 
@@ -278,8 +281,7 @@ if build_installer
         message('Adding a windows installer target: \'windows_installer\'')
     else
         error(
-            'unsuported system for building the installer: '
-            + host_machine.system(),
+            'unsuported system for building the installer: ' + host_machine.system(),
         )
 
     endif
@@ -296,10 +298,7 @@ endif
 if is_flatpak_build
     app_name = 'com.github.mgerhold.OOPetris'
     core_lib += {
-        'compile_args': [
-            core_lib.get('compile_args'),
-            '-DFLATPAK_BUILD'
-        ],
+        'compile_args': [core_lib.get('compile_args'), '-DFLATPAK_BUILD'],
     }
 endif