Improve and fix the AppImage and MacOS builds.

Author: Arignir

.github/workflows/build.yml

@@ -51,7 +51,12 @@ jobs:
       - name: Install Dependencies
         run: |
           echo "Installing dependencies"
-          brew install meson ninja create-dmg glew libarchive
+          brew install meson ninja create-dmg libarchive
+
+          # Install glew 2.2.0 because the latest version doesn't ship with a static library anymore
+          brew tap-new hades/dependencies
+          brew extract --version=2.2.0 glew hades/dependencies
+          brew install hades/dependencies/glew@2.2.0
 
       - name: Build the SDL3
         run: |
@@ -221,7 +226,7 @@ jobs:
       - name: Build Hades
         run: |
           # Setup the Meson project
-          meson setup build --buildtype=release -Dstatic_sdl3=true --prefix=/usr
+          meson setup build --buildtype=release -Dstatic_sdl3=true -Dwith_wayland=false --prefix=/usr
 
           # Build & Install the project
           DESTDIR=$(pwd)/AppDir ninja -C build install

meson.build

@@ -43,6 +43,11 @@ if get_option('static_executable')
     ldflags += ['-static']
 endif
 
+if get_option('with_wayland')
+    cflags += ['-DWITH_WAYLAND']
+    ldflags += ['-DWITH_WAYLAND']
+endif
+
 debugger_cflags = ['-DWITH_DEBUGGER']
 debugger_ldflags = ['-DWITH_DEBUGGER']
 

meson_options.txt

@@ -1,4 +1,5 @@
 option('with_debugger', type: 'boolean', value: false, description: 'Build hades with its builtin debugger.')
+option('with_wayland', type: 'boolean', value: true, description: 'Will try to use wayland (if available) by default on Linux.')
 option('static_executable', type: 'boolean', value: false, description: 'Build hades as a static executable.')
 option('static_dependencies', type: 'boolean', value: false, description: 'Similar to `static_executable\' but only link the external dependencies and not the system ones.')
 option('static_glew', type: 'boolean', value: false, description: 'Link statically against glew.')

resource/linux/AppImageBuilder.yml

@@ -36,9 +36,8 @@ AppDir:
     - libgtk-3-0
     - libgtk-3-common
     - libglew2.2
-    - libdecor-0-0
-    - libdecor-0-plugin-1-cairo
     - librsvg2-common  # See https://github.com/hades-emu/Hades/issues/102
+    - libwayland-client0
 
   files:
     include: []

source/app/main.c

@@ -71,16 +71,15 @@ SDL_AppInit(
     if (!app->args.without_gui) {
 
 #if defined(__linux__)
+#if defined(WITH_WAYLAND)
         // On Linux, hint at SDL that we are using Wayland if WAYLAND_DISPLAY is set.
         if (getenv("WAYLAND_DISPLAY")) {
             SDL_SetHint(SDL_HINT_VIDEO_DRIVER, "wayland");
         }
+#else
+        SDL_SetHint(SDL_HINT_VIDEO_DRIVER, "x11");
+#endif
 #endif
-
-        if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD | SDL_INIT_AUDIO)) {
-            logln(HS_ERROR, "Failed to init the SDL: %s", SDL_GetError());
-            return SDL_APP_FAILURE;
-        }
 
         SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_NAME_STRING, "Hades");
         SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_VERSION_STRING, HADES_VERSION);
@@ -90,6 +89,11 @@ SDL_AppInit(
         SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_URL_STRING, "https://hades-emu.org");
         SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_TYPE_STRING, "application");
 
+        if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD | SDL_INIT_AUDIO)) {
+            logln(HS_ERROR, "Failed to init the SDL: %s", SDL_GetError());
+            return SDL_APP_FAILURE;
+        }
+
         app_sdl_audio_init(app);
         app_sdl_video_init(app);