Fix CI

.github/workflows/FreeBSD.yml

@@ -1,19 +1,22 @@
 name: Build FreeBSD
+on: [push]
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/[email protected]
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Build
         id: test
         uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
           prepare: |
-            pkg install -y curl cmake libX11 libXi libXrandr libXinerama libXcursor libglvnd alsa-lib
+            pkg install -y cmake libX11 libXi libXrandr libXinerama libXcursor libglvnd alsa-lib
           run: |
-            cmake -B build -GNinja
+            cmake -B build
             cmake --build build --config Release
       - name: Release
         uses: actions/upload-artifact@v2

.github/workflows/Linux.yml

@@ -1,18 +1,21 @@
 name: Build Linux
+on: [push]
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/[email protected] 
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true' 
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y libx11-dev libxi-dev libxrandr-dev libxinerama-dev libxcursor-dev
           sudo apt-get install -y libgl1-mesa-dev libegl1-mesa-dev libasound2-dev
       - name: Build
         run: |
-          cmake -B build -GNinja
+          cmake -B build
           cmake --build build --config Release
       - name: Release
         uses: actions/upload-artifact@v2

.github/workflows/MacOS.yml

@@ -1,14 +1,17 @@
 name: Build macOS
+on: [push]
 jobs:
   build-and-deploy:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/[email protected] 
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Build
         run: |
-          cmake -B build -GNinja
-          cmake --build build--config Release
+          cmake -B build
+          cmake --build build --config Release
       - name: Build DMG
         run: |
           cd build

.github/workflows/Windows.yml

@@ -1,15 +1,18 @@
 name: Build Windows
+on: [push]
 jobs:
   build-and-deploy:
     runs-on: windows-2019
     steps:
       - name: Checkout
-        uses: actions/[email protected] 
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Get latest CMake and ninja
         uses: lukka/get-cmake@latest
       - name: Build 
         run: |
-          cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -B build
+          cmake -G "Visual Studio 16 2019" -A x64 -B build
           cmake --build build --config Release
       - name: Release
         uses: actions/upload-artifact@v2

.github/workflows/iOS.yml

@@ -5,7 +5,9 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/[email protected] 
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Build
         run: |
           cmake -GXcode -DSOKOL_BACKEND=SOKOL_METAL -DCMAKE_SYSTEM_NAME=iOS -B build

CMakeLists.txt

@@ -19,8 +19,10 @@ set(BUILD_SHARED_LIBS OFF)
 set(BUILD_STATIC_LIBS ON)
 set(DPP_BUILD_TEST OFF)
 
+# TODO: instead, set HYDRA_DEFINITIONS
 if (WIN32)
     add_definitions(-DHYDRA_WINDOWS)
+    add_definitions(-DWIN32_LEAN_AND_MEAN)
     set(HYDRA_WINDOWS 1)
 elseif(APPLE)
     add_definitions(-DHYDRA_MACOS)
@@ -77,7 +79,7 @@ elseif(HYDRA_IOS)
         # "-framework GameController"
     )
 elseif(HYDRA_MACOS)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     set(HYDRA_LIBRARIES ${HYDRA_LIBRARIES}
         # "-framework QuartzCore"
         # "-framework Cocoa"

include/settings.hxx

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "SDL_opengl.h"
 #include <compatibility.hxx>
 #include <corewrapper.hxx>
 #include <filesystem>
@@ -13,7 +12,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <SDL3/SDL_render.h>
 #include <stdexcept>
 #include <string>
 
@@ -30,7 +28,7 @@ struct CoreInfo
     int max_players;
     std::vector<std::string> firmware_files;
     std::vector<std::string> extensions;
-    GLuint icon_texture = 0;
+    unsigned int icon_texture = 0;
 };
 
 // Essentially a wrapper around a std::map<std::string, std::string> that locks a mutex

src/corewrapper.cxx

@@ -1,6 +1,7 @@
 #include "hydra/core.hxx"
 #define OPENSSL_API_COMPAT 10101
 #include <corewrapper.hxx>
+#include <filesystem>
 #include <openssl/md5.h>
 #include <scopeguard.hxx>
 #include <settings.hxx>