X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic_combiner;h=12da46c1ffe4184cf454097db3305ffe4223032e;hb=fb30f7149ffc18494ce38696ab88d5494ca9dfaf;hp=3cf60d8315bf492ba5508e4edfcc2866bd8a1b36;hpb=5a3e836da9480bca0c3ef3384fa2010f358ccc7e;p=dcpomatic.git diff --git a/run/dcpomatic_combiner b/run/dcpomatic_combiner index 3cf60d831..12da46c1f 100755 --- a/run/dcpomatic_combiner +++ b/run/dcpomatic_combiner @@ -1,7 +1,8 @@ #!/bin/bash -export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +source $DIR/environment + if [ "$1" == "--debug" ]; then shift gdb --args build/src/tools/dcpomatic2_combiner $*