diff options
Diffstat (limited to 'run')
| -rwxr-xr-x | run/benchmarks | 8 | ||||
| -rwxr-xr-x | run/dcpomatic | 1 | ||||
| -rwxr-xr-x | run/dcpomatic_player | 2 | ||||
| -rwxr-xr-x | run/tests | 6 |
4 files changed, 13 insertions, 4 deletions
diff --git a/run/benchmarks b/run/benchmarks new file mode 100755 index 000000000..1138e9e0f --- /dev/null +++ b/run/benchmarks @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +source $DIR/environment + +build/benchmark/image_benchmark diff --git a/run/dcpomatic b/run/dcpomatic index e415f426c..9b4165ed6 100755 --- a/run/dcpomatic +++ b/run/dcpomatic @@ -12,6 +12,7 @@ fi # Allow running from a tree built using cdist export LD_LIBRARY_PATH=$DIR/../../../lib:$DIR/../../../lib64:$LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=$DIR/../../../lib:$DIR/../../../lib64:$DYLD_LIBRARY_PATH # export ASAN_OPTIONS=verbosity=1:malloc_context_size=20:detect_leaks=1 diff --git a/run/dcpomatic_player b/run/dcpomatic_player index 7d9ab9ff3..00fed9aef 100755 --- a/run/dcpomatic_player +++ b/run/dcpomatic_player @@ -10,7 +10,7 @@ else env=x86_64/10.10 fi -export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib +export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:$HOME/src/dcpomatic/lib:/usr/local/lib # Allow running from a tree built using cdist export LD_LIBRARY_PATH=$DIR/../../../lib:$DIR/../../../lib64:$LD_LIBRARY_PATH @@ -3,7 +3,7 @@ # e.g. --run_tests=foo set -e -PRIVATE_GIT="3193af1f18fd6f0fd8c8a77055e44bfdf93437e8" +PRIVATE_GIT="eaa907382be3276e8275858219bd73c816ff5c77" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source $DIR/environment @@ -86,9 +86,9 @@ if [ "$(uname)" == "Darwin" ]; then # We need to find ffcmp in here export PATH=$PATH:$HOME/workspace/bin if [ -d "$environment/$(uname -m)/11.0" ]; then - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$environment/$(uname -m)/11.0/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$environment/$(uname -m)/11.0/lib:$DIR/../../../lib else - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$environment/$(uname -m)/10.10/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$environment/$(uname -m)/10.10/lib:$DIR/../../../lib fi fi |