From 04f9905ca0fb47c4ee364e3e4218efb569ee9604 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 29 Jan 2025 08:51:47 -0800 Subject: [PATCH] Fix MacOS SDL build in buildRelease github workflow (#527) * Update buildRelease workflow to use sdl2-2.30.11 on MacOS * In buildRelease workflow, update Macos build for SDL to use -DMAIKO_DISPLAY_SDL=2 instead of =ON --- .github/workflows/buildRelease.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index fcf3ead..cdb65a1 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -310,8 +310,8 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg - hdiutil attach SDL2-2.26.5.dmg + gh release download release-2.30.11 --repo libsdl-org/SDL --pattern SDL2-2.30.11.dmg + hdiutil attach SDL2-2.30.11.dmg sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework hdiutil detach /Volumes/SDL2/ @@ -337,7 +337,7 @@ jobs: # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 cmake .. \ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ - -DMAIKO_DISPLAY_SDL=ON \ + -DMAIKO_DISPLAY_SDL=2 \ -DMAIKO_DISPLAY_X11=ON \ -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release