7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-30 11:17:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

undo that

Browse source
This commit is contained in:
qimiko 2024-06-27 16:40:36 -07:00
parent 41ecd8e892
commit 36af716e36
No known key found for this signature in database
GPG key ID: D2D404DD810FE0E3
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -176,16 +176,14 @@ jobs:
${{ env.base-configure-command }} ${{ env.base-configure-command }}
-DCMAKE_C_COMPILER=clang -DCMAKE_C_COMPILER=clang
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15"
-DCMAKE_AR='/usr/bin/ar' -DCMAKE_AR='/usr/bin/ar'
-DCMAKE_RANLIB='/usr/bin/ranlib' -DCMAKE_RANLIB='/usr/bin/ranlib'
-DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off
-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
${{ steps.build-debug-info.outputs.extra-configure }} ${{ steps.build-debug-info.outputs.extra-configure }}
env: env:
MACOSX_DEPLOYMENT_TARGET: "10.15" 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 - name: Build
run: | run: |
@ -193,8 +191,6 @@ jobs:
${{ steps.build-debug-info.outputs.extra-build }} ${{ steps.build-debug-info.outputs.extra-build }}
env: env:
MACOSX_DEPLOYMENT_TARGET: "10.15" 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 - name: Upload Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

2
cmake/Platform.cmake
View file

@ -25,7 +25,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
endif() endif()
# only exists as a global property # 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 target_link_libraries(${PROJECT_NAME} INTERFACE
"-framework Cocoa" "-framework Cocoa"