diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-01 00:06:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-01 00:06:19 +0100 |
| commit | cf8bbea2de38c4e9ac140f55b27311b7b6dcd814 (patch) | |
| tree | 7786cf4672ce8c5134c5b9e53947609a1e1c9cc3 /run | |
| parent | 22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5 (diff) | |
| parent | bbb2a4b7ccec953900d13e7bcdad229028bc7795 (diff) | |
Merge master.
Diffstat (limited to 'run')
| -rwxr-xr-x | run/dcpomatic | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/run/dcpomatic b/run/dcpomatic index b0036fb6f..9cf5a2619 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 @@ -56,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 "$resources/$lang" + cp build/src/lib/mo/$lang/*.mo "$resources/$lang" + cp build/src/wx/mo/$lang/*.mo "$resources/$lang" + cp build/src/tools/mo/$lang/*.mo "$resources/$lang" + done sed -e "s/@VERSION@/test/g" platform/osx/Info.plist.in > $app/Contents/Info.plist @@ -76,8 +84,7 @@ if [ `uname -s` == "Darwin" ]; then fi done - cd build/platform/osx/DCP-o-matic.app/Contents/MacOS - ./dcpomatic $* + 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 |