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

diff --git a/run/dcpomatic b/run/dcpomatic
index 43703fe68..429139dac 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -1,12 +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
-export DCPOMATIC_SHARE_PREFIX=.
+source $DIR/environment
 binary=$build/src/tools/dcpomatic2
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args $binary $*
@@ -32,5 +29,5 @@ 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