From 23d37621d503fabcbeb1872cb047a751bb6ac2c8 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Tue, 26 Jul 2022 00:58:02 +0300 Subject: [PATCH] Backport to OS X 10.11 (#91) --- .github/workflows/Build.yml | 2 +- .github/workflows/release.yml | 2 +- CMakeLists.txt | 2 +- README.md | 2 +- os/macos/Info.plist | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index f3ed011..404938c 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -115,7 +115,7 @@ jobs: uses: actions/cache@v3 with: path: build - key: macos-cmake-v2 + key: macos-cmake-v3 - name: Configure run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba8445c..3889610 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,7 +95,7 @@ jobs: uses: actions/cache@v3 with: path: build - key: macos-cmake-v2 + key: macos-cmake-v3 - name: Configure run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index fd2f47f..c469d14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) set(EXECUTABLE_NAME fallout2-ce) if (APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "") set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "") endif() diff --git a/README.md b/README.md index 28453cb..4f10a38 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ $ sudo apt install libsdl2-2.0-0 ### macOS -> **NOTE**: macOS 11 or higher is required. +> **NOTE**: macOS 10.11 (El Capitan) or higher is required. Runs natively on Intel-based Macs and Apple Silicon. - Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder somewhere, for example `/Applications/Fallout2`. diff --git a/os/macos/Info.plist b/os/macos/Info.plist index 8d9cae2..5d5b555 100644 --- a/os/macos/Info.plist +++ b/os/macos/Info.plist @@ -29,7 +29,7 @@ NSHighResolutionCapable True LSMinimumSystemVersion - 11 + 10.11 SDL_FILESYSTEM_BASE_DIR_TYPE parent