mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-14 19:15:05 -05:00
Apple ci readd pch (#862)
* Install llvm for macos * fix macos llvm path * try macos linker * try lld * fix lld * no idea anymore * test llvm ar * commend these for now * test this one
This commit is contained in:
parent
049482efdd
commit
8ea17f3d38
2 changed files with 15 additions and 1 deletions
11
.github/workflows/build.yml
vendored
11
.github/workflows/build.yml
vendored
|
@ -40,6 +40,8 @@ jobs:
|
|||
extra_flags: >
|
||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
|
||||
-DGEODE_DONT_BUILD_TEST_MODS=1
|
||||
-DCMAKE_AR=/usr/bin/ar
|
||||
-DGEODE_DISABLE_PRECOMPILED_HEADERS=Off
|
||||
package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg'
|
||||
installer_path: './installer/mac/geode-installer-mac.pkg'
|
||||
|
||||
|
@ -138,7 +140,7 @@ jobs:
|
|||
7z x ninja.zip -o"$GITHUB_WORKSPACE/ninja"
|
||||
echo "$GITHUB_WORKSPACE/ninja" >> $GITHUB_PATH
|
||||
|
||||
- name: Update LLVM
|
||||
- name: Update LLVM (Windows)
|
||||
shell: bash
|
||||
run: |
|
||||
curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/LLVM-17.0.6-win64.exe -o llvm-inst.exe
|
||||
|
@ -146,6 +148,13 @@ jobs:
|
|||
echo "$GITHUB_WORKSPACE/llvm/bin" >> $GITHUB_PATH
|
||||
if: matrix.config.id == 'win'
|
||||
|
||||
# - name: Install LLVM (MacOS)
|
||||
# shell: bash
|
||||
# run: |
|
||||
# brew install llvm
|
||||
# echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
|
||||
# if: matrix.config.id == 'mac'
|
||||
|
||||
- name: Download CLI
|
||||
uses: robinraju/release-downloader@v1.9
|
||||
with:
|
||||
|
|
|
@ -195,6 +195,11 @@ if (WIN32)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
# if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
# set_property(TARGET ${PROJECT_NAME} PROPERTY LINKER_TYPE LLD)
|
||||
# target_link_options(${PROJECT_NAME} INTERFACE -fuse-ld=lld)
|
||||
# endif ()
|
||||
|
||||
# We do not support anything below SDK 23
|
||||
if (ANDROID)
|
||||
string(REGEX MATCH "[0-9]+" ANDROID_PLATFORM_NUMBER "${ANDROID_PLATFORM}")
|
||||
|
|
Loading…
Reference in a new issue