Re-enable sound in macOS builds

anothersimulacrum · Mar 25, 2023 · 4f2388f · 4f2388f
1 parent 0321f99
commit 4f2388f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -154,9 +154,9 @@ jobs:
             native: osx
             sanitize: undefined
             tiles: 1
-            sound: 0
+            sound: 1
             localize: 1
-            title: Clang 14, macOS 12, Tiles, UBSan
+            title: Clang 14, macOS 12, Tiles, Sound, UBSan
             # ~880MB ccache-compressed in a clean build
             # ~100 compressed
             # observed usage: 3.85GB -> 500MB
@@ -266,6 +266,7 @@ jobs:
         sdl2: latest
         sdl2-ttf: latest
         sdl2-image: latest
+        sdl2-mixer: latest
     - name: install build dependencies (mac)
       if: ${{ env.SKIP == 'false' && runner.os == 'macOS' }}
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -241,6 +241,7 @@ jobs:
           sdl2: latest
           sdl2-ttf: latest
           sdl2-image: latest
+          sdl2-mixer: latest
       - name: Install build dependencies (mac)
         if: runner.os == 'macOS'
         run: |
@@ -286,7 +287,7 @@ jobs:
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
         run: |
-          make -j3 TILES=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=10.13 FRAMEWORK=1 dmgdist
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=10.13 FRAMEWORK=1 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'