diff --git a/Makefile b/Makefile index 079487d9..0b0e5771 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ SRC_SVG:=bridge.svg EXE_NAME:=proton-bridge REVISION:=$(shell git rev-parse --short=10 HEAD) BUILD_TIME:=$(shell date +%FT%T%z) -MACOS_MIN_VERSION=11.0 +MACOS_MIN_VERSION_ARM64=11.0 +MACOS_MIN_VERSION_AMD64=10.15 BUILD_FLAGS:=-tags='${BUILD_TAGS}' BUILD_FLAGS_LAUNCHER:=${BUILD_FLAGS} @@ -88,8 +89,8 @@ go-build=go build $(1) -o $(2) $(3) go-build-finalize=${go-build} ifeq "${GOOS}-$(shell uname -m)" "darwin-arm64" go-build-finalize= \ - MACOSX_DEPLOYMENT_TARGET=${MACOS_MIN_VERSION} CGO_ENABLED=1 CGO_CFLAGS="-mmacosx-version-min=${MACOS_MIN_VERSION}" GOARCH=arm64 $(call go-build,$(1),$(2)_arm,$(3)) && \ - MACOSX_DEPLOYMENT_TARGET=${MACOS_MIN_VERSION} CGO_ENABLED=1 CGO_CFLAGS="-mmacosx-version-min=${MACOS_MIN_VERSION}" GOARCH=amd64 $(call go-build,$(1),$(2)_amd,$(3)) && \ + MACOSX_DEPLOYMENT_TARGET=${MACOS_MIN_VERSION_ARM64} CGO_ENABLED=1 CGO_CFLAGS="-mmacosx-version-min=${MACOS_MIN_VERSION_ARM64}" GOARCH=arm64 $(call go-build,$(1),$(2)_arm,$(3)) && \ + MACOSX_DEPLOYMENT_TARGET=${MACOS_MIN_VERSION_AMD64} CGO_ENABLED=1 CGO_CFLAGS="-mmacosx-version-min=${MACOS_MIN_VERSION_AMD64}" GOARCH=amd64 $(call go-build,$(1),$(2)_amd,$(3)) && \ lipo -create -output $(2) $(2)_arm $(2)_amd && rm -f $(2)_arm $(2)_amd endif diff --git a/go.mod b/go.mod index b1f5321c..6fb8496d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557 github.com/Masterminds/semver/v3 v3.1.1 - github.com/ProtonMail/gluon v0.14.2-0.20221206104410-725ddb9db68a + github.com/ProtonMail/gluon v0.14.2-0.20221207071431-0faa318d3c9f github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a github.com/ProtonMail/go-proton-api v0.2.1 github.com/ProtonMail/go-rfc5322 v0.11.0 diff --git a/go.sum b/go.sum index 8b03525c..e3d773c1 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkF github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g= github.com/ProtonMail/gluon v0.14.2-0.20221206104410-725ddb9db68a h1:BwWVZcvvf9Pw353+wZGD3X433kPFT4SjQVnYKD0YBRY= github.com/ProtonMail/gluon v0.14.2-0.20221206104410-725ddb9db68a/go.mod h1:z2AxLIiBCT1K+0OBHyaDI7AEaO5qI6/BEC2TE42vs4Q= +github.com/ProtonMail/gluon v0.14.2-0.20221207071431-0faa318d3c9f h1:73b28jayIkYr1cJPHSHFMGyFgk1h6iJ127kuYX8UaRo= +github.com/ProtonMail/gluon v0.14.2-0.20221207071431-0faa318d3c9f/go.mod h1:z2AxLIiBCT1K+0OBHyaDI7AEaO5qI6/BEC2TE42vs4Q= github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4= github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= diff --git a/internal/frontend/bridge-gui/BridgeSetup.cmake b/internal/frontend/bridge-gui/BridgeSetup.cmake index 0ac865b7..7c6c634c 100644 --- a/internal/frontend/bridge-gui/BridgeSetup.cmake +++ b/internal/frontend/bridge-gui/BridgeSetup.cmake @@ -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 () diff --git a/internal/frontend/bridge-gui/bridge-gui/build.sh b/internal/frontend/bridge-gui/bridge-gui/build.sh index 25bcbf46..b3796a71 100755 --- a/internal/frontend/bridge-gui/bridge-gui/build.sh +++ b/internal/frontend/bridge-gui/bridge-gui/build.sh @@ -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 diff --git a/internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-11-0.cmake b/internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-10-15.cmake similarity index 80% rename from internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-11-0.cmake rename to internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-10-15.cmake index d60cb352..b1b5486d 100644 --- a/internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-11-0.cmake +++ b/internal/frontend/bridge-gui/bridge-gui/vcpkg/triplets/x64-osx-min-10-15.cmake @@ -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")