yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: catalina build.

Browse Source 
Other: fix intel build of bridge-gui.
This commit is contained in:
Xavier Michelon
2022-11-30 15:20:39 +01:00
parent 6c30a04ac0
commit 49d65292c0
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/frontend/bridge-gui/BridgeSetup.cmake
View File

@ -19,9 +19,6 @@
include_guard()
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
if (NOT DEFINED BRIDGE_REPO_ROOT)
message(FATAL_ERROR "BRIDGE_REPO_ROOT is not defined.")
endif()
@ -73,11 +70,13 @@ if (APPLE)
endif()
if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
message(STATUS "Building for Apple Silicon Mac computers")
set(VCPKG_TARGET_TRIPLET arm64-osx-min-11-0)
elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
message(STATUS "Building for Intel based Mac computers")
set(VCPKG_TARGET_TRIPLET x64-osx-min-11-0)
set(VCPKG_TARGET_TRIPLET x64-osx-min-10-15)
else ()
message(FATAL_ERROR "Unknown value for CMAKE_OSX_ARCHITECTURE. Please use one of \"arm64\" and \"x86_64\". Multiple architectures are not supported.")
endif ()

2
internal/frontend/bridge-gui/bridge-gui/build.sh
View File

@ -71,7 +71,7 @@ check_exit "Failed to bootstrap vcpkg."
if [[ "$OSTYPE" == "darwin"* ]]; then
${VCPKG_EXE} install sentry-native:arm64-osx-min-11-0 grpc:arm64-osx-min-11-0 --overlay-triplets=vcpkg/triplets --clean-after-build
check_exit "Failed installing gRPC for macOS / Apple Silicon"
${VCPKG_EXE} install sentry-native:x64-osx-min-11-0 grpc:x64-osx-min-11-0 --overlay-triplets=vcpkg/triplets --clean-after-build
${VCPKG_EXE} install sentry-native:x64-osx-min-10-15 grpc:x64-osx-min-10-15 --overlay-triplets=vcpkg/triplets --clean-after-build
check_exit "Failed installing gRPC for macOS / Intel x64"
elif [[ "$OSTYPE" == "linux"* ]]; then
${VCPKG_EXE} install sentry-native:x64-linux grpc:x64-linux --clean-after-build

2
internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-11-0.cmake → internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-10-15.cmake
View File

@ -4,4 +4,4 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64)
set(VCPKG_OSX_DEPLOYMENT_TARGET "11.0")
set(VCPKG_OSX_DEPLOYMENT_TARGET "10.15")