It's now safe to get _video_container_size without the lock.

[dcpomatic.git] / run / dcpomatic

diff --git a/run/dcpomatic b/run/dcpomatic
index 6de2989ae35a05ed10bf60b6099078d04db10d1a..8da7d7fab2fcc38cbffb7cc658764c569ed2bb34 100755 (executable)
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -1,11 +1,9 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-build=$DIR/../build
-export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib
-export DCPOMATIC_GRAPHICS=$DIR/../graphics
+source $DIR/environment
 binary=$build/src/tools/dcpomatic2
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args $binary $*