X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=run%2Fdcpomatic_cli;h=b32462e59a090ba88754460b3323775423850149;hp=bf2f080157b2fd837d74fddabd61eaae415f4e48;hb=988e8d923fa30bca1be6ec78455324e1f2e62771;hpb=92cafb6fc686a041354da2eabde6bcb2f6846e1d

diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
index bf2f08015..b32462e59 100755
--- a/run/dcpomatic_cli
+++ b/run/dcpomatic_cli
@@ -1,12 +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" --leak-check=full --show-reachable=yes 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