X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fset_paths.sh;h=24baa6cd612fb249489e1dc2494088f65c75c936;hb=HEAD;hp=44bf3fa8230bac269faa111d1dbe39b0a677a690;hpb=d7d6a97d2aa6c71289cbcb7ec1caa07e08258deb;p=dcpomatic.git

diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 44bf3fa82..24baa6cd6 100644
--- a/platform/osx/set_paths.sh
+++ b/platform/osx/set_paths.sh
@@ -1,11 +1,23 @@
-base=$HOME/dcpomatic
-env=$HOME/osx-environment
+SDK=$1
+if [[ "$SDK" == 11 ]]; then
+	isysroot="-isysroot $HOME/SDK/MacOS11.0.sdk"
+	base=$HOME/workspace
+	export MACOSX_DEPLOYMENT_TARGET=10.10
+else
+	base=/usr/local
+fi
+
+arch=$(uname -m)
+if [[ "$arch" == arm64 ]]; then
+	env=$HOME/osx-environment/arm64/11.0
+else
+	env=$HOME/osx-environment/x86_64/10.10
+fi
 sdk=$HOME/SDK
 
-export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export LINKFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export MACOSX_DEPLOYMENT_TARGET=10.9
-export CXXFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export CFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export PATH=$env/x86_64/bin:$PATH
-export PKG_CONFIG_PATH=$env/x86_64/lib/pkgconfig:$base/lib/pkgconfig
+export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib $isysroot -arch $arch"
+export LINKFLAGS="-L$base/lib -L$env/lib $isysroot -arch $arch"
+export CXXFLAGS="-I$base/include -I$env/include $isysroot -arch $arch"
+export CFLAGS="-I$base/include -I$env/include $isysroot -arch $arch"
+export PATH=$env/bin:$PATH
+export PKG_CONFIG_PATH=$env/lib/pkgconfig:$base/lib/pkgconfig