X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=run%2Fdcpomatic;h=6de2989ae35a05ed10bf60b6099078d04db10d1a;hp=ef695eb3f12714d51b15017dc5b9df9e4351f2ea;hb=HEAD;hpb=f113e0f98c50e27ecdb648d21a64220300a6a114

diff --git a/run/dcpomatic b/run/dcpomatic
index ef695eb3f..45f857ae2 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -1,28 +1,47 @@
 #!/bin/bash
 
-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/carl/Environments/dcpomatic/64/lib
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+binary=$build/src/tools/dcpomatic2
+
+if [[ "$(uname -m)" == arm64 ]]; then
+    env=arm64/11.0
+else
+    env=x86_64/10.10
+fi
+
+export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib
+
+# export ASAN_OPTIONS=verbosity=1:malloc_context_size=20:detect_leaks=1
+
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args build/src/tools/dcpomatic2 $*
+    if [[ "$(uname)" == Darwin ]]; then
+        /Applications/Xcode.app/Contents/Developer/usr/bin/lldb $binary $*
+    else
+        gdb --args $binary $*
+    fi
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes --show-leak-kinds=all --leak-check=full build/src/tools/dcpomatic2 $*
+    valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes --show-leak-kinds=all --leak-check=full $binary $*
 elif [ "$1" == "--callgrind" ]; then
     shift
-    valgrind --tool="callgrind" build/src/tools/dcpomatic2 $*
+    valgrind --tool="callgrind" $binary $*
 elif [ "$1" == "--massif" ]; then
     shift
-    valgrind --tool="massif" build/src/tools/dcpomatic2 $*
+    valgrind --tool="massif" $binary $*
 elif [ "$1" == "--i18n" ]; then
     shift
-    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic2 "$*"
+    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 $binary "$*"
 elif [ "$1" == "--perf" ]; then
     shift
-    perf record build/src/tools/dcpomatic2 $*
+    perf record $binary $*
 elif [ "$1" == "--scaled" ]; then
     shift
-    ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 build/src/tools/dcpomatic2 $*
+    ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 $binary $*
+elif [ "$1" == "--screenshot" ]; then
+    shift
+    GTK_PATH=/usr/local/lib/gtk-3.0 GTK_MODULES=gtk-vector-screenshot $binary "$*"
 else
-    build/src/tools/dcpomatic2 $*
+    $binary $* 2> >(grep -v Gtk-CRITICAL | grep -v Gtk-WARNING)
 fi