mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-27 09:55:34 -05:00
undo that
This commit is contained in:
parent
41ecd8e892
commit
36af716e36
2 changed files with 3 additions and 7 deletions
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
@ -176,16 +176,14 @@ jobs:
|
|||
${{ env.base-configure-command }}
|
||||
-DCMAKE_C_COMPILER=clang
|
||||
-DCMAKE_CXX_COMPILER=clang++
|
||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
|
||||
-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15"
|
||||
-DCMAKE_AR='/usr/bin/ar'
|
||||
-DCMAKE_RANLIB='/usr/bin/ranlib'
|
||||
-DGEODE_DISABLE_PRECOMPILED_HEADERS=Off
|
||||
-DCMAKE_OSX_ARCHITECTURES="arm64"
|
||||
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
|
||||
${{ steps.build-debug-info.outputs.extra-configure }}
|
||||
env:
|
||||
MACOSX_DEPLOYMENT_TARGET: "10.15"
|
||||
LDFLAGS: -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++
|
||||
CPPFLAGS: -I/opt/homebrew/opt/llvm/include
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
|
@ -193,8 +191,6 @@ jobs:
|
|||
${{ steps.build-debug-info.outputs.extra-build }}
|
||||
env:
|
||||
MACOSX_DEPLOYMENT_TARGET: "10.15"
|
||||
LDFLAGS: -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++
|
||||
CPPFLAGS: -I/opt/homebrew/opt/llvm/include
|
||||
|
||||
- name: Upload Artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
|
|
|
@ -25,7 +25,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
|
|||
endif()
|
||||
|
||||
# only exists as a global property
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} INTERFACE
|
||||
"-framework Cocoa"
|
||||
|
|
Loading…
Reference in a new issue