From 7d6f88f8e4c49c8018d5bb0d7aa051ef6e9f94d6 Mon Sep 17 00:00:00 2001 From: Street Pea Date: Thu, 12 Dec 2024 17:58:53 -0800 Subject: [PATCH] Update action to use macos-13 as 12 now deprecated --- .github/workflows/build-macos-x86.yml | 4 ++-- CMakeLists.txt | 8 ++++++++ gui/MacOSXBundleInfo.plist.in | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos-x86.yml b/.github/workflows/build-macos-x86.yml index 05899c01e..99644a55a 100644 --- a/.github/workflows/build-macos-x86.yml +++ b/.github/workflows/build-macos-x86.yml @@ -6,7 +6,7 @@ on: jobs: build-mac_x64: name: Build macOSX x86_64 version - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: @@ -19,7 +19,7 @@ jobs: - name: Install brew dependencies run: | brew update - brew install --force qt@6 ffmpeg pkgconfig opus openssl cmake ninja nasm sdl2 protobuf speexdsp libplacebo wget python-setuptools json-c miniupnpc + brew install --force qt@6 ffmpeg pkgconfig opus openssl cmake ninja nasm sdl2 protobuf speexdsp libplacebo wget python-setuptools json-c miniupnpc || true - name: Configure chiaki-ng run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index a4d5a1d1c..424745318 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,3 +272,11 @@ endif() if(CHIAKI_ENABLE_BOREALIS) add_subdirectory(switch) endif() + +if(APPLE) + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") + set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0.0) + else() + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10.0) + endif() +endif() \ No newline at end of file diff --git a/gui/MacOSXBundleInfo.plist.in b/gui/MacOSXBundleInfo.plist.in index fd90d8445..510ab75d5 100644 --- a/gui/MacOSXBundleInfo.plist.in +++ b/gui/MacOSXBundleInfo.plist.in @@ -14,6 +14,8 @@ ${MACOSX_BUNDLE_GUI_IDENTIFIER} CFBundleInfoDictionaryVersion 6.0 + LSMinimumSystemVersion + ${CMAKE_OSX_DEPLOYMENT_TARGET} CFBundleName ${MACOSX_BUNDLE_BUNDLE_NAME} CFBundlePackageType