X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic;h=429139dac3794494b938f6f76e746449e840cbf3;hb=eb3301dbdf655a36c98f50eb9b4adcfe4d1dad0c;hp=8ce6d060a2c23bc0ee3608ed44d20aff97670f28;hpb=2f2df8e53124bee8bc8312f37bc8608dc46085d6;p=dcpomatic.git diff --git a/run/dcpomatic b/run/dcpomatic index 8ce6d060a..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 $* @@ -31,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