diff options
| -rwxr-xr-x | run/dcpomatic | 1 | ||||
| -rw-r--r-- | run/environment | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/run/dcpomatic b/run/dcpomatic index abc0cf11b..c4b1d15f2 100755 --- a/run/dcpomatic +++ b/run/dcpomatic @@ -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 diff --git a/run/environment b/run/environment index 822e0603a..cf1448c23 100644 --- a/run/environment +++ b/run/environment @@ -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 |