Merge branch '1.0' into 1.0-vob

diff --git a/ChangeLog b/ChangeLog
index 1c404dde33ce2e53336a888c132579a37432cd77..788e658bc5c4f3545b91766dcbe9a849cb14ae89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-29  Carl Hetherington  <cth@carlh.net>
+
+       * Fix build for 32-bit versions of OS X.
+
 2013-11-27  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.37 released.

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index ccff4d567c5c16318ecd094d9a18b2c9f5c067f4..5280d3ededacd25a9b5353fb2fd06018b5ccce59 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -91,7 +91,9 @@ for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do
   changes=""
   for dep in $deps; do
     base=`basename $dep`
-    changes="$changes -change $dep @executable_path/../lib/$base"
+    # $dep will be a path within 64/; make a 32/ path too
+    dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
+    changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base"
   done
   if test "x$changes" != "x"; then
     install_name_tool $changes $obj