Tinker with local build path setup on macOS.
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2025 22:56:41 +0000 (23:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2025 22:56:41 +0000 (23:56 +0100)
run/dcpomatic
run/environment

index abc0cf11b4400691d7a27b8e15c8eef30119ef69..c4b1d15f225084b3c73e358fe07db814e89a8431 100755 (executable)
@@ -12,7 +12,6 @@ fi
 
 # Allow running from a tree built using cdist
 export LD_LIBRARY_PATH=$DIR/../../../lib:$DIR/../../../lib64:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib
 
 # export ASAN_OPTIONS=verbosity=1:malloc_context_size=20:detect_leaks=1
 
index 822e0603a1e764c351f141507d55f4d4aa2cd39f..cf1448c23d2ddc32fc4e57073df09509554bfdbf 100644 (file)
@@ -1,3 +1,9 @@
+if [[ "$(uname -m)" == arm64 ]]; then
+    env_sub=arm64/11.0
+else
+    env_sub=x86_64/10.10
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 build=$DIR/../build
 env=$DIR/../../..
@@ -5,6 +11,6 @@ export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$env/lib:/usr/local/lib64:/u
 if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then
   export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH
 fi
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/Users/ci/workspace/lib
+export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/Users/ci/workspace/lib:/Users/cah/osx-environment/$env_sub/lib:/usr/local/lib
 export DCPOMATIC_GRAPHICS=$DIR/../graphics