Merge master.

[dcpomatic.git] / run / dcpomatic

diff --git a/run/dcpomatic b/run/dcpomatic
index 544ffc040c37063b3ff25fcad554cc782a3d36af..b0036fb6ff1b5743a55e3e0f8366741725a17fa5 100755 (executable)
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -27,7 +27,6 @@ if [ `uname -s` == "Darwin" ]; then
   cp $DEP/libavutil*.dylib $lib
   cp $DEP/libavcodec*.dylib $lib
   cp $DEP/libswscale*.dylib $lib
-  cp $DEP/libpostproc*.dylib $lib
   cp $DEP/libswresample*.dylib $lib
   cp $ENV/libboost_system.dylib $lib
   cp $ENV/libboost_filesystem.dylib $lib
@@ -77,30 +76,31 @@ if [ `uname -s` == "Darwin" ]; then
     fi
   done  
   
-  open $app
+  cd build/platform/osx/DCP-o-matic.app/Contents/MacOS
+  ./dcpomatic $*
 
 else
   export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
   if [ "$1" == "--debug" ]; then
       shift
-      gdb --args build/src/tools/dcpomatic $*
+      gdb --args build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--valgrind" ]; then
       shift
-      valgrind --tool="memcheck" build/src/tools/dcpomatic $*
+      valgrind --tool="memcheck" build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--callgrind" ]; then
       shift
-      valgrind --tool="callgrind" build/src/tools/dcpomatic $*
+      valgrind --tool="callgrind" build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--massif" ]; then
       shift
-      valgrind --tool="massif" build/src/tools/dcpomatic $*
+      valgrind --tool="massif" build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--i18n" ]; then
       shift
-      LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic "$*"
+      LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2 "$*"
   elif [ "$1" == "--perf" ]; then
       shift
-      perf record build/src/tools/dcpomatic $*
+      perf record build/src/tools/dcpomatic2 $*
   else
-      build/src/tools/dcpomatic $*
+      build/src/tools/dcpomatic2 $*
   fi
 fi