Merge branch 'Saturn-Next' into mac-ci-test

This reverts commit 8433d04a12.

.github/workflows/macos.yml

@@ -0,0 +1,62 @@
+name: macOS
+
+on:
+  push:
+    branches: [ "mac-ci-test"]
+  pull_request:
+    branches: [ "mac-ci-test"]
+
+jobs:
+  build:
+    continue-on-error: true
+    strategy:
+      matrix:
+        arch:
+          - runner: macos-latest
+            name: aarch64
+          - runner: macos-15-intel
+            name: x86_64
+
+    name: ${{ matrix.arch.name }}
+    runs-on: ${{ matrix.arch.runner }}
+
+    steps:
+    - uses: actions/checkout@v6.0.1
+
+    - name: Install dependencies
+      run: brew install --formula sdl2 sdl2_mixer game-music-emu libopenmpt
+
+    - name: Download Kart assets
+      run: |
+        curl -L \
+        -o AssetsLinuxOnly.zip \
+        "https://github.com/STJr/Kart-Public/releases/download/v1.6/AssetsLinuxOnly.zip"
+
+    - name: Extract Kart assets
+      run: |
+        mkdir -p assets/installer
+        unzip -q AssetsLinuxOnly.zip -d assets/installer
+
+    - name: Configure CMake
+      run: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build SRB2Kart-Saturn
+      run: ninja -C build
+
+      #idk what im doing here tbh i pray this works
+    - name: Package DMG
+      run: |
+        cd build
+        cpack -G DragNDrop
+
+    #- name: Upload build artifact
+    #  uses: actions/upload-artifact@v6.0.0
+    #  with:
+    #    name: srb2kartsaturn-macOS-${{ matrix.arch.name }}-${{ github.sha }}
+    #    path: build/bin
+
+    - name: Upload DMG
+      uses: actions/upload-artifact@v6.0.0
+      with:
+        name: srb2kartsaturn-macOS-${{ matrix.arch.name }}-${{ github.sha }}
+        path: build/*.dmg

CMakeLists.txt

@@ -29,7 +29,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
 	elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
 		set(SRB2_CPACK_GENERATOR "TGZ")
 	elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-		set(SRB2_CPACK_GENERATOR "TGZ")
+		set(SRB2_CPACK_GENERATOR "DragNDrop")
 	endif()
 endif()