Merge pull request #100 from sharkwouter/switch-to-SDL3

Switch to sdl3

Author: sharkwouter

.github/workflows/build.yml

@@ -9,30 +9,23 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y wget cmake libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libjsoncpp-dev libfuse2
+          sudo apt-get install --no-install-recommends git ca-certificates g++ make cmake zlib1g-dev libasound-dev libxkbcommon-dev libdrm-dev libgl1-mesa-dev libgbm-dev libwayland-dev libdecor-0-dev
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Build tinygettext
-        run: |
-          cd vendor/tinygettext
-          cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DTINYGETTEXT_WITH_SDL=ON
-          cd build
-          make
-          sudo make install
       - name: Build
         run: |
           mkdir oceanpop && cd oceanpop
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DSDL_X11=OFF ..
           cmake --build .
           strip --strip-unneeded oceanpop
           make install DESTDIR=AppDir
           wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
           chmod +x linuxdeploy*.AppImage
           ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: oceanpop-linux
           path: |
@@ -58,7 +51,7 @@ jobs:
             mingw-w64-x86_64-jsoncpp
           update: true
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Build
@@ -68,13 +61,34 @@ jobs:
           cmake --build .
           strip --strip-unneeded oceanpop.exe
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: oceanpop-windows
           path: |
             oceanpop/oceanpop.exe
             oceanpop/assets
 
+  MacOS:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Build
+        run: |
+          mkdir oceanpop && cd oceanpop
+          cmake -DCMAKE_BUILD_TYPE=Release ..
+          cmake --build .
+          strip -u -r -x oceanpop
+      - name: Publish artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: oceanpop-macos
+          path: |
+            oceanpop/oceanpop
+            oceanpop/assets
+
   PS2:
     runs-on: ubuntu-latest
     container:
@@ -84,7 +98,7 @@ jobs:
       run: |
         apk add --no-cache gmp mpc1 mpfr4 make pkgconf cmake git
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: recursive
     - name: Build
@@ -94,7 +108,7 @@ jobs:
         cmake --build  .
         mips64r5900el-ps2-elf-strip --strip-unneeded oceanpop.elf
     - name: Publish artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: oceanpop-ps2
         path: |
@@ -107,7 +121,7 @@ jobs:
     container: pspdev/pspdev:latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Build
@@ -116,7 +130,7 @@ jobs:
           psp-cmake -DCMAKE_BUILD_TYPE=Release ..
           cmake --build .
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: oceanpop-psp
           path: |
@@ -128,7 +142,7 @@ jobs:
     container: vitasdk/vitasdk:latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Build
@@ -137,7 +151,7 @@ jobs:
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="${VITASDK}/share/vita.toolchain.cmake" ..
           cmake --build .
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: oceanpop-vita
           path: |
@@ -146,9 +160,10 @@ jobs:
   Wii:
     runs-on: ubuntu-latest
     container: devkitpro/devkitppc:latest
+    if: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Build
@@ -160,27 +175,27 @@ jobs:
         run: |
           ./platform/wii/make_release.sh oceanpop ${{ github.ref_name }}
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: oceanpop-wii
           path: |
             oceanpop/oceanpop*.zip
 
   Release:
-    needs: [Linux, Windows, PSP, Vita, Wii, PS2]
+    needs: [Linux, Windows, MacOS, PSP, Vita, PS2]
     if: ${{ github.ref_type == 'tag' }}
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 1
       matrix:
-        build: [linux, windows, psp, vita, wii, ps2]
+        build: [linux, windows, macos, psp, vita, ps2]
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v8
     - name: Zip artifacts
       run: |
         zip -r oceanpop-${{matrix.build}}.zip oceanpop-${{matrix.build}}
     - name: Release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v3
       with:
         files: oceanpop-${{matrix.build}}.zip
         prerelease: true