This commit is contained in:
ConfiG 2024-06-28 15:17:24 +03:00 committed by GitHub
parent 193899bf3d
commit 0bb056d08e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 9 deletions

View file

@ -167,6 +167,7 @@ jobs:
run: |
brew install llvm@14
echo "/opt/homebrew/opt/llvm@14/bin" >> $GITHUB_PATH
if: false
- name: Setup CLI
uses: geode-sdk/cli/.github/actions/setup@main
@ -178,19 +179,14 @@ jobs:
-DCMAKE_CXX_COMPILER=clang++
-DCMAKE_AR='/usr/bin/ar'
-DCMAKE_RANLIB='/usr/bin/ranlib'
-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15"
-DGEODE_DISABLE_PRECOMPILED_HEADERS=Off
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
${{ steps.build-debug-info.outputs.extra-configure }}
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
- name: Build
run: |
${{ env.base-build-command }}
${{ steps.build-debug-info.outputs.extra-build }}
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
- name: Upload Artifacts
uses: actions/upload-artifact@v4

View file

@ -24,10 +24,6 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
endif()
# only exists as a global property
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.15")
target_link_libraries(${PROJECT_NAME} INTERFACE
"-framework Cocoa"
"-framework OpenGL"