X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=e9727476639e10bc6243777ec3fbd03ca98d66f0;hp=78c3bb819d5539dcfb69af18bb923ba7bcc5d76a;hb=a5e87b6f0f496f4ed71d9129d40a5baebb68495f;hpb=e491397c0028a80ac4a48a92007f783746553c1a

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 78c3bb819..e97274766 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -63,6 +63,9 @@ universal_copy_lib $ROOT libcxml "$WORK/$libs"
 universal_copy_lib $ROOT libdcp-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libdcp-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libsub "$WORK/$libs"
+universal_copy_lib $ROOT libasdcp-libsub-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libkumu-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
@@ -77,6 +80,7 @@ universal_copy_lib $ENV libboost_system "$WORK/$libs"
 universal_copy_lib $ENV libboost_filesystem "$WORK/$libs"
 universal_copy_lib $ENV libboost_thread "$WORK/$libs"
 universal_copy_lib $ENV libboost_date_time "$WORK/$libs"
+universal_copy_lib $ENV libboost_locale "$WORK/$libs"
 universal_copy_lib $ENV libxml++ "$WORK/$libs"
 universal_copy_lib $ENV libxslt "$WORK/$libs"
 universal_copy_lib $ENV libxml2 "$WORK/$libs"
@@ -125,21 +129,22 @@ for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$mac
   fi
 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"
-cp icons/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/build/platform/osx/Info.plist "$WORK/$approot"
+cp $ROOT/32/src/dcpomatic/icons/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
+cp $ROOT/32/src/dcpomatic/icons/colour_conversions.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/icons/defaults.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/icons/kdm_email.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/icons/servers.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/icons/tms.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/icons/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/LiberationSans-Regular.ttf "$WORK/$resources"
 
 # i18n: DCP-o-matic .mo files
 for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
   mkdir -p "$WORK/$resources/$lang/LC_MESSAGES"
-  cp build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
-  cp build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
-  cp build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
 done
 
 # i18n: wxWidgets .mo files