Make set_paths.sh work on x86_64 and arm64.

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

diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 5a84a82d951e797eb389cc45f5d450826c8a946f..65fcdedf37f8a3cc60d314390fffcb702d99ce18 100644 (file)
--- a/platform/osx/set_paths.sh
+++ b/platform/osx/set_paths.sh
@@ -1,12 +1,15 @@
-base=$HOME/dcpomatic
-env=$HOME/osx-environment
+base=$HOME/workspace
+if [[ "$(uname -m)" == 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/MacOSX10.9.sdk -arch x86_64"
-export LINKFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX10.9.sdk -arch x86_64"
-export MACOSX_DEPLOYMENT_TARGET=10.9
-export CXXFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX10.9.sdk -arch x86_64"
-export CFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX10.9.sdk -arch x86_64"
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$base/lib:$env/64/lib
-export PATH=$env/64/bin:$PATH
-export PKG_CONFIG_PATH=$env/64/lib/pkgconfig:$base/lib/pkgconfig
+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 PATH=$env/bin:$PATH
+export PKG_CONFIG_PATH=$env/lib/pkgconfig:$base/lib/pkgconfig