Skip to content

Commit

Permalink
Update action to use macos-13 as 12 now deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
streetpea committed Dec 13, 2024
1 parent b89b96f commit b650927
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-macos-x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand Down
10 changes: 9 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ include(CPack)

set(CHIAKI_IS_SWITCH ${NSWITCH})

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()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT_SOURCE_DIR}/setsu/cmake")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT_SOURCE_DIR}/steamdeck_native/cmake")
set(CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -271,4 +279,4 @@ endif()

if(CHIAKI_ENABLE_BOREALIS)
add_subdirectory(switch)
endif()
endif()
2 changes: 2 additions & 0 deletions gui/MacOSXBundleInfo.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>LSMinimumSystemVersion</key>
<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
Expand Down

0 comments on commit b650927

Please sign in to comment.