fix flatpak installer build

Author: Totto16

com.github.mgerhold.OOPetris.yml

@@ -21,7 +21,7 @@ modules:
     config-opts:
       - -Dbuildtype=release
       - -Ddefault_library=shared
-      - -Dflatpak_build=true
+      - -Dbuild_installer=true
       - --libdir=lib
       - -Dtests=true
     builddir: true

meson.options

@@ -1,8 +1,8 @@
 option(
-    'flatpak_build',
+    'build_installer',
     type: 'boolean',
     value: false,
-    description: 'enable flatpak build features',
+    description: 'build the installer, this is either a flatpak or windows exe installer or similar',
 )
 
 option(

src/helper/graphic_utils.cpp

@@ -67,7 +67,7 @@ std::vector<std::string> utils::supported_features() {
     if (!resource_path) {
         throw std::runtime_error{ "Failed in getting the Pref Path: " + std::string{ SDL_GetError() } };
     }
-// if you build in BUILD_INSTALLER mode, you have to assure that the data is there eg. music  + fonts!
+// if you build in BUILD_INSTALLER mode, you have to assure that the data is there e.g. music  + fonts!
 #endif
     return std::filesystem::path{ std::string{ resource_path } } / "assets";
 #else

src/meson.build

@@ -124,3 +124,8 @@ liboopetris_graphics_dep = declare_dependency(
     dependencies: graphics_lib.get('deps'),
     version: meson.project_version(),
 )
+
+# setting this to strings, so += {...} gets detected as an error, if it is done after that
+core_lib = 'undefined'
+recordings_lib = 'undefined'
+graphics_lib = 'undefined'

tools/dependencies/meson.build

@@ -262,7 +262,52 @@ utf8cpp_dep = dependency(
 )
 core_lib += {'deps': [core_lib.get('deps'), utf8cpp_dep]}
 
-is_flatpak_build = get_option('flatpak_build')
+
+build_installer = get_option('build_installer')
+
+is_flatpak_build = false
+
+# some sanity checks for the installer
+if build_installer
+    if get_option('buildtype') != 'release'
+        error(
+            'buildtype needs to be \'release\', when building the installer, but was: ' +
+            get_option('buildtype'),
+        )
+    endif
+
+    if host_machine.system() == 'linux'
+        if get_option('prefix') == '/app'
+            is_flatpak_build = true
+        else
+            error(
+                'only support flatpak builds, when  building the installer for linux',
+            )
+        endif
+    elif host_machine.system() == 'windows'
+        error('windows installer is still WIP')
+    else
+        error(
+            'unsuported system for building the installer: ' + host_machine.system(),
+        )
+
+    endif
+
+endif
+
+
+
+if is_flatpak_build
+    app_name = 'com.github.mgerhold.OOPetris'
+    core_lib += {
+        'compile_args': [
+            core_lib.get('compile_args'),
+            '-DFLATPAK_BUILD',
+            '-DBUILD_INSTALLER',
+        ],
+    }
+endif
+
 
 have_file_dialogs = false
 have_discord_sdk = false

tools/install/meson.build

@@ -11,13 +11,6 @@ install_subdir(
 app_name = 'oopetris'
 if is_flatpak_build
     app_name = 'com.github.mgerhold.OOPetris'
-    core_lib += {
-        'compile_args': [
-            core_lib.get('compile_args'),
-            '-DFLATPAK_BUILD',
-            '-DBUILD_INSTALLER',
-        ],
-    }
 endif
 
 conf = configuration_data()

tools/options/meson.build

@@ -64,6 +64,7 @@ if (
     get_option('buildtype') == 'debug'
     or get_option('buildtype') == 'debugoptimized'
 )
+#TODO: replace with ! NDEBUG in cpp files and remove this
     core_lib += {
         'compile_args': [core_lib.get('compile_args'), '-DDEBUG_BUILD'],
     }