Merge tag 'v2.16.78' into v2.17.x

[dcpomatic.git] / run / dcpomatic_disk

diff --git a/run/dcpomatic_disk b/run/dcpomatic_disk
index a4b4ead55f8907273db321bcb9ae875c0725516b..ff5d8e7e51692c774b5e9d3479865d6ddd8f19e3 100755 (executable)
--- a/run/dcpomatic_disk
+++ b/run/dcpomatic_disk
@@ -3,6 +3,14 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $DIR/environment
 
+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
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_disk $*
@@ -17,7 +25,7 @@ elif [ "$1" == "--massif" ]; then
     valgrind --tool="massif" build/src/tools/dcpomatic2_disk $*
 elif [ "$1" == "--i18n" ]; then
     shift
-    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic2_disk "$*"
+    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic2_disk $*
 elif [ "$1" == "--perf" ]; then
     shift
     perf record build/src/tools/dcpomatic2_disk $*