X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic_disk_writer;h=b2e1a872ddee4dbc3fd442e801e1d5fabc589943;hb=HEAD;hp=6d20f3ae46391ac34d63f07091f1be621b8e6b6e;hpb=f1685116cff0a02ff94cc6d4961654b0afaefe7a;p=dcpomatic.git

diff --git a/run/dcpomatic_disk_writer b/run/dcpomatic_disk_writer
index 6d20f3ae4..2dff961fb 100755
--- a/run/dcpomatic_disk_writer
+++ b/run/dcpomatic_disk_writer
@@ -1,10 +1,18 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$HOME/osx-environment/x86_64/lib
+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
+
 exe=build/src/tools/dcpomatic2_disk_writer
-sudo chown root $exe
-sudo chmod 4755 $exe
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args $exe $*
@@ -27,5 +35,5 @@ elif [ "$1" == "--scaled" ]; then
     shift
     ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 $exe $*
 else
-    $exe $*
+    sudo DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH $exe $*
 fi