X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fdcpomatic;h=74714865ae0b05224e2562b957f3a912aa44c5c6;hb=02865f1226908fb781e9a775638fdeec79bace8b;hp=544ffc040c37063b3ff25fcad554cc782a3d36af;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;p=dcpomatic.git diff --git a/run/dcpomatic b/run/dcpomatic index 544ffc040..74714865a 100755 --- a/run/dcpomatic +++ b/run/dcpomatic @@ -4,8 +4,8 @@ if [ `uname -s` == "Darwin" ]; then # Some time ago we could start DCP-o-matic on OS X just by running the executable, in # the same way as Linux. This doesn't work any more. - ENV=$HOME/Environments/osx/64/lib - DEP=$HOME/cdist/64/lib + ENV=$HOME/Environments/osx/10.6/64/lib + DEP=$HOME/dcpomatic-deps/lib app=build/platform/osx/DCP-o-matic.app macos=$app/Contents/MacOS @@ -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 @@ -57,11 +56,19 @@ if [ `uname -s` == "Darwin" ]; then cp $ENV/libquickmail*.dylib $lib cp $ENV/libcurl*.dylib $lib cp $ENV/libffi*.dylib $lib + cp $ENV/libiconv*.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 + + for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do + mkdir -p "$resources/$lang/LC_MESSAGES" + cp build/src/lib/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES" + cp build/src/wx/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES" + cp build/src/tools/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES" + done sed -e "s/@VERSION@/test/g" platform/osx/Info.plist.in > $app/Contents/Info.plist @@ -77,30 +84,30 @@ if [ `uname -s` == "Darwin" ]; then fi done - open $app + open build/platform/osx/DCP-o-matic.app 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