diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a688bbb..a6463bc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index a1fd167a..e4eb18f8 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -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"