summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-24 18:45:15 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-24 18:45:15 +0100
commit8bb3523288dfc7fd10b97c55e2e9a4a6a962c2c4 (patch)
tree64d8e19f9217be896ab3f8909c0b53d8ac4ec3d1
parent8464c6c8db946dfdd50161ae616212e63cc3eaa7 (diff)
More OS X build hacks.
-rw-r--r--platform/osx/make_dmg.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 9d38cb668..e0f3ddb29 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -26,7 +26,7 @@ mkdir -p "$WORK/$macos"
mkdir -p "$WORK/$libs"
mkdir -p "$WORK/$resources"
-relink=""
+relink="dcpomatic|"
function universal_copy {
for f in $1/32/$2; do
@@ -102,9 +102,8 @@ universal_copy_lib $ENV libquickmail "$WORK/$libs"
universal_copy_lib $ENV libcurl "$WORK/$libs"
universal_copy_lib $ENV libffi "$WORK/$libs"
universal_copy_lib $ENV libiconv "$WORK/$libs"
-universal_copy_lib $ENV libpangomm "$WORK/$libs"
-universal_copy_lib $ENV libcairomm "$WORK/$libs"
-universal_copy_lib $ENV libpangocairo "$WORK/$libs"
+universal_copy_lib $ENV libpango "$WORK/$libs"
+universal_copy_lib $ENV libcairo "$WORK/$libs"
for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)"`