diff --git a/.github/workflows/ReleaseBuilds.yml b/.github/workflows/ReleaseBuilds.yml index 43c5aa8..51d66b7 100644 --- a/.github/workflows/ReleaseBuilds.yml +++ b/.github/workflows/ReleaseBuilds.yml @@ -4,20 +4,16 @@ on: [workflow_dispatch] jobs: build-macos: - runs-on: macos-12 + runs-on: macos-11 timeout-minutes: 15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: ref: master - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 13 - - run: bash build-mac-app.sh - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: mac-build path: SpaceCadetPinball-*-mac.dmg diff --git a/CMakeLists.txt b/CMakeLists.txt index fb705ed..cbe114e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ if(APPLE) set(MACOSX_RPATH) set(CMAKE_BUILD_WITH_INSTALL_RPATH true) set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11") set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") list(APPEND SDL2_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs") list(APPEND SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs") diff --git a/Platform/macOS/Info.plist b/Platform/macOS/Info.plist index 021cd74..4c2b538 100644 --- a/Platform/macOS/Info.plist +++ b/Platform/macOS/Info.plist @@ -28,8 +28,6 @@ CSResourcesFileMapped - LSMinimumSystemVersion - 10.11 NSHighResolutionCapable diff --git a/README.md b/README.md index 277eeeb..c93417f 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,7 @@ Supports data files from Windows and Full Tilt versions of the game. | Android (WIP) | Iscle | https://github.com/Iscle/SpaceCadetPinball | | Nintendo Wii | MaikelChan | https://github.com/MaikelChan/SpaceCadetPinball | | Nintendo 3DS | MaikelChan | https://github.com/MaikelChan/SpaceCadetPinball/tree/3ds | -| Nintendo DS | Headshotnoby | https://github.com/headshot2017/3dpinball-nds | | Nintendo Wii U | IntriguingTiles | https://github.com/IntriguingTiles/SpaceCadetPinball-WiiU | -| PlayStation 2 | Headshotnoby | https://github.com/headshot2017/3dpinball-ps2 | -| Sega Dreamcast | Headshotnoby | https://github.com/headshot2017/3dpinball-dc | | MorphOS | BeWorld | https://www.morphos-storage.net/?id=1688897 | | AmigaOS 4 | rjd324 | http://aminet.net/package/game/actio/spacecadetpinball-aos4 | | Android (WIP) | fexed | https://github.com/fexed/Pinball-on-Android | @@ -79,17 +76,6 @@ This project is available as Flatpak on [Flathub](https://flathub.org/apps/detai Install XCode (or at least Xcode Command Line Tools with `xcode-select --install`) and CMake. -**HomeBrew** - -You can easily install the build artifact by using `brew`. - -```sh -brew tap draftbrew/tap -brew install --no-quarantine space-cadet-pinball -``` - -Be aware that the flag `--no-quarantime` will disable macOS's Gatekeeper during installation. - **Manual compilation:** * **Homebrew**: Install the `SDL2`, `SDL2_mixer` homebrew packages. diff --git a/build-mac-app.sh b/build-mac-app.sh index 501b0ea..aec1e48 100755 --- a/build-mac-app.sh +++ b/build-mac-app.sh @@ -6,13 +6,13 @@ mkdir -p Libs cd Libs -sdl_version='2.30.4' +sdl_version='2.28.1' sdl_filename="SDL2-$sdl_version.dmg" sdl_url="https://github.com/libsdl-org/SDL/releases/download/release-$sdl_version/$sdl_filename" -sdl_mixer_version='2.8.0' +sdl_mixer_version='2.7.0' sdl_mixer_filename="SDL2_mixer-$sdl_mixer_version.dmg" -sdl_mixer_url="https://github.com/libsdl-org/SDL_mixer/releases/download/release-$sdl_mixer_version/$sdl_mixer_filename" +sdl_mixer_url="https://www.libsdl.org/tmp/$sdl_mixer_filename" mount_point="$(mktemp -d)" @@ -20,7 +20,7 @@ if [ ! -f "$sdl_filename" ]; then curl -sSf -L -O "$sdl_url" fi -echo "2bf2cb8f6b44d584b14e8d4ca7437080d1d968fe3962303be27217b336b82249 $sdl_filename" | shasum -a 256 -c +echo "2f936225c10a402cab07055e6f75de76f991945c37feb0cf6af633a96d2fb28c $sdl_filename" | shasum -a 256 -c hdiutil attach "$sdl_filename" -mountpoint "$mount_point" -quiet cp -a "$mount_point/SDL2.framework" . hdiutil detach "$mount_point" @@ -29,7 +29,7 @@ if [ ! -f "$sdl_mixer_filename" ]; then curl -sSf -L -O "$sdl_mixer_url" fi -echo "aea973d78f2949b0b2404379dfe775ac367c69485c1d25a5c59f109797f18adf $sdl_mixer_filename" | shasum -a 256 -c +echo "f394c714c8aefdcae0ff9d6eefeb5d42f28e56ed09fcaebb796cb672ca11279d $sdl_mixer_filename" | shasum -a 256 -c hdiutil attach "$sdl_mixer_filename" -mountpoint "$mount_point" -quiet cp -a "$mount_point/SDL2_mixer.framework" . hdiutil detach "$mount_point"