diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-29 23:01:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-29 23:01:31 +0000 |
| commit | f0be0f0e060e40d9a0da1b44429ef41901b8a536 (patch) | |
| tree | 8283672b973cc7582d993eb02ac67b2d4f0b30ee | |
| parent | bdbb254c18b100f8fa66a3707f6b515309d05685 (diff) | |
| parent | af95bb7c2cebf8793b16c9d103dc84fca13b05de (diff) | |
Merge branch '1.0' into 1.0-vob
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -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 ccff4d567..5280d3ede 100644 --- 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 |