From 905923d65ad92f78749a21210ec56c666ffe5524 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 13 Dec 2023 18:34:18 +0100 Subject: [PATCH] [build,mac] deployment target & arch variables allow easy change of target architectures and deployment target --- scripts/bundle-mac-os.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/bundle-mac-os.sh b/scripts/bundle-mac-os.sh index f24bb028b..67b4bb6e0 100755 --- a/scripts/bundle-mac-os.sh +++ b/scripts/bundle-mac-os.sh @@ -11,14 +11,23 @@ BINDIR=MacOS LIBDIR=Frameworks DATADIR=Resources -OSSL_FLAGS="-arch arm64 -arch x86_64" +DEPLOYMENT_ARCH="arm64 x86_64" +DEPLOYMENT_TARGET=12 + +CMAKE_ARCHS= +OSSL_FLAGS="-mmacosx-version-min=$DEPLOYMENT_TARGET" +for $ARCH in $DEPLOYMENT_ARCH; +do + OSSL_FLAGS="$OSSL_FLAGS -arch $ARCH" + CMAKE_ARCHS="$CMAKE_ARCHS;$ARCH" +done CMAKE_ARGS="-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=12 \ + -DCMAKE_OSX_ARCHITECTURES=$CMAKE_ARCHS \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$DEPLOYMENT_TARGET \ -DCMAKE_INSTALL_PREFIX='$INSTALL' \ -DCMAKE_INSTALL_LIBDIR='$LIBDIR' \ -DCMAKE_INSTALL_BINDIR='$BINDIR' \