X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic;h=b0036fb6ff1b5743a55e3e0f8366741725a17fa5;hb=97e09772b91038e223f16f9bbfd5fdef1a6cd552;hp=65cca420596e7e520985501c0836c8e110b4f1dc;hpb=6deca3038ff7a9f2067ff266a21133e8181c56ce;p=dcpomatic.git

diff --git a/run/dcpomatic b/run/dcpomatic
index 65cca4205..b0036fb6f 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -10,7 +10,8 @@ if [ `uname -s` == "Darwin" ]; then
   app=build/platform/osx/DCP-o-matic.app
   macos=$app/Contents/MacOS
   lib=$app/Contents/lib
-  mkdir -p $macos $lib
+  resources=$app/Contents/Resources
+  mkdir -p $macos $lib $resources
 
   cp build/src/tools/dcpomatic $macos
   cp build/src/lib/libdcpomatic.dylib $lib
@@ -26,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
@@ -56,6 +56,11 @@ if [ `uname -s` == "Darwin" ]; then
   cp $ENV/libquickmail*.dylib $lib
   cp $ENV/libcurl*.dylib $lib
   cp $ENV/libffi*.dylib $lib
+  cp icons/defaults.png $resources
+  cp icons/servers.png $resources
+  cp icons/tms.png $resources
+  cp icons/colour_conversions.png $resources
+  cp icons/kdm_email.png $resources
  
   sed -e "s/@VERSION@/test/g" platform/osx/Info.plist.in > $app/Contents/Info.plist
 
@@ -71,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