X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic_cli;h=b32462e59a090ba88754460b3323775423850149;hb=7c6e1bcdaf52d6167631dbf9b1612e80356391c4;hp=ea2a987631238e71d949d6430f52070cc5294995;hpb=8102046b2f29e0c7b234c29bf204b056cb30e64f;p=dcpomatic.git

diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
index ea2a98763..b32462e59 100755
--- a/run/dcpomatic_cli
+++ b/run/dcpomatic_cli
@@ -1,13 +1,20 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
+binary=$DIR/../build/src/tools/dcpomatic2_cli
+
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args build/src/tools/dcpomatic_cli "$@"
+    gdb --args $binary "$@"
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic_cli "$@"
-#    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic_cli "$@"
+#    valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@"
+    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions $binary "$@"
+elif [ "$1" == "--callgrind" ]; then
+    shift
+    valgrind --tool="callgrind" $binary "$@"
 else
-    build/src/tools/dcpomatic_cli "$@"
+    $binary "$@"
 fi