Use $HOME rather than hard-coded user name.

[dcpomatic.git] / platform / osx / set_paths.sh

diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 91d67ba940dd023afdf26ff53a797c57e2df683c..24baa6cd612fb249489e1dc2494088f65c75c936 100644 (file)
--- a/platform/osx/set_paths.sh
+++ b/platform/osx/set_paths.sh
@@ -1,11 +1,23 @@
-base=$HOME/workspace
-env=$HOME/osx-environment/x86_64/10.10
+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/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export LINKFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export MACOSX_DEPLOYMENT_TARGET=10.10
-export CXXFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export CFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+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