X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=run%2Fdcpomatic;h=429139dac3794494b938f6f76e746449e840cbf3;hb=ef39232e9bfaf37e0124cb6030debb0334c1477d;hp=7e8f923a37194099f05c9a630d4f5be0a0f3ff74;hpb=4c798e9ec122b8e8fcdfa4e12adb718a277329b1;p=dcpomatic.git

diff --git a/run/dcpomatic b/run/dcpomatic
index 7e8f923a3..429139dac 100755
--- 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/c.hetherington/osx-environment/64/lib
-export DCPOMATIC_GRAPHICS=$DIR/../graphics
+source $DIR/environment
 binary=$build/src/tools/dcpomatic2
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args $binary $*
@@ -27,6 +25,9 @@ elif [ "$1" == "--perf" ]; then
 elif [ "$1" == "--scaled" ]; then
     shift
     ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 $binary $*
+elif [ "$1" == "--screenshot" ]; then
+    shift
+    GTK_PATH=/usr/local/lib/gtk-3.0 GTK_MODULES=gtk-vector-screenshot $binary "$*"
 else
-    $binary $*
+    $binary $* 2> >(grep -v Gtk-CRITICAL | grep -v Gtk-WARNING)
 fi