diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-24 16:28:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-24 16:28:28 +0100 |
| commit | 4656657c27198d67a188b11e17c42c6ac58ecfba (patch) | |
| tree | f9c46e199e0b53dbddedee90fa96c84a4c41d9cf | |
| parent | 0c01a21ffc4cf9eea71a662916cc3095f2634216 (diff) | |
| parent | 14fcf28acc8ade256772f9091fcf5e80dbf53a0c (diff) | |
Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | wscript | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index b6e7154dc..ab4d3624e 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -70,6 +70,7 @@ universal_copy $ENV lib/libfontconfig*.dylib $WORK/$libs universal_copy $ENV lib/libfreetype*.dylib $WORK/$libs universal_copy $ENV lib/libexpat*.dylib $WORK/$libs universal_copy $ENV lib/libltdl*.dylib $WORK/$libs +universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs for obj in $WORK/$macos/dcpomatic $WORK/$libs/*.dylib; do deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh)"` @@ -35,7 +35,7 @@ def configure(conf): conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX # Common CXXFLAGS - conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra', '-D_FILE_OFFSET_BITS=64']) if conf.options.enable_debug: @@ -64,7 +64,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX') conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']) conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['PREFIX']) - conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS') boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') |