X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic;h=ee509fcbd24293d22968d1696456b73b1bea8271;hb=bf0fb7f4f556946c18da151e468f237d9ca96094;hp=fff9783e550ee7ccc09035780cb30898763e72b8;hpb=3667c77f9037a7e7efe241fee72626813af94973;p=dcpomatic.git

diff --git a/run/dcpomatic b/run/dcpomatic
index fff9783e5..ee509fcbd 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -1,29 +1,30 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=/Users/carl/Environments/osx/64/lib:build/src/lib:build/src/wx:build/src/asdcplib/src:$DYLD_LIBRARY_PATH
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+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
+export DCPOMATIC_GRAPHICS=$DIR/../graphics
 if [ "$1" == "--debug" ]; then
     shift
-    if [ `which gdb` ]; then
-      gdb --args build/src/tools/dcpomatic $*
-    else
-      lldb build/src/tools/dcpomatic $*
-    fi
+    gdb --args build/src/tools/dcpomatic2 $*
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" build/src/tools/dcpomatic $*
+    valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes --show-leak-kinds=all --leak-check=full build/src/tools/dcpomatic2 $*
 elif [ "$1" == "--callgrind" ]; then
     shift
-    valgrind --tool="callgrind" build/src/tools/dcpomatic $*
+    valgrind --tool="callgrind" build/src/tools/dcpomatic2 $*
 elif [ "$1" == "--massif" ]; then
     shift
-    valgrind --tool="massif" build/src/tools/dcpomatic $*
+    valgrind --tool="massif" build/src/tools/dcpomatic2 $*
 elif [ "$1" == "--i18n" ]; then
     shift
-    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic "$*"
+    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic2 "$*"
 elif [ "$1" == "--perf" ]; then
     shift
-    perf record build/src/tools/dcpomatic $*
+    perf record build/src/tools/dcpomatic2 $*
+elif [ "$1" == "--scaled" ]; then
+    shift
+    ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 build/src/tools/dcpomatic2 $*
 else
-    build/src/tools/dcpomatic $*
+    build/src/tools/dcpomatic2 $*
 fi