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

diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
index e1c0ebd14..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/dcpomatic2_cli "$@"
+    gdb --args $binary "$@"
 elif [ "$1" == "--valgrind" ]; then
     shift
-    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 build/src/tools/dcpomatic2_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/dcpomatic2_cli "$@"
+    $binary "$@"
 fi