Merge master.

[dcpomatic.git] / platform / osx / make_dmg.sh

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index eb06d3bb5241f721a782b9ce09cf5315b29e83f4..52a6a710103ce0b0ae232bbaec5011b01c6a9bf9 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -55,7 +55,6 @@ universal_copy $ROOT lib/libavfilter*.dylib $WORK/$libs
 universal_copy $ROOT lib/libavutil*.dylib $WORK/$libs
 universal_copy $ROOT lib/libavcodec*.dylib $WORK/$libs
 universal_copy $ROOT lib/libswscale*.dylib $WORK/$libs
-universal_copy $ROOT lib/libpostproc*.dylib $WORK/$libs
 universal_copy $ROOT lib/libswresample*.dylib $WORK/$libs
 universal_copy $ROOT bin/ffprobe $WORK/$macos
 universal_copy $ENV lib/libboost_system.dylib $WORK/$libs
@@ -88,7 +87,7 @@ universal_copy $ENV lib/libcurl*.dylib $WORK/$libs
 universal_copy $ENV lib/libffi*.dylib $WORK/$libs
 
 for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do
-  deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl)"`
+  deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl|libxmlsec)"`
   changes=""
   for dep in $deps; do
     base=`basename $dep`
@@ -103,13 +102,18 @@ done
 
 cp build/platform/osx/Info.plist $WORK/$approot
 cp icons/dcpomatic.icns $WORK/$resources/DCP-o-matic.icns
+cp icons/colour_conversions.png $WORK/$resources
+cp icons/defaults.png $WORK/$resources
+cp icons/kdm_email.png $WORK/$resources
+cp icons/servers.png $WORK/$resources
+cp icons/tms.png $WORK/$resources
 
 # i18n: .mo files
-for l in de_DE es_ES fr_FR it_IT sv_SE; do
-  mkdir $WORK/$resources/$l
-  cp build/src/lib/mo/$1/*.mo $WORK/$resources/$l
-  cp build/src/wx/mo/$1/*.mo $WORK/$resources/$l
-  cp build/src/tools/mo/$1/*.mo $WORK/$resources/$l
+for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
+  mkdir $WORK/$resources/$lang
+  cp build/src/lib/mo/$lang/*.mo $WORK/$resources/$lang
+  cp build/src/wx/mo/$lang/*.mo $WORK/$resources/$lang
+  cp build/src/tools/mo/$lang/*.mo $WORK/$resources/$lang
 done
 
 tmp_dmg=$WORK/dcpomatic_tmp.dmg