X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=f258f5dfe7b9dd1f1d9b119797fb4d6ffd275295;hb=refs%2Fheads%2Fattic%2Fdist.pre-squash;hp=aa2a46b41bf54f725a8f95d14e533c1cf9afe260;hpb=e8c503a22aba8a153f55c252146c4f07f06042af;p=dcpomatic.git

diff --git a/cscript b/cscript
index aa2a46b41..f258f5dfe 100644
--- a/cscript
+++ b/cscript
@@ -347,7 +347,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%posttrans', file=f)
     print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
-def dependencies(target):
+def dependencies(target, options):
 
     if target.platform == 'linux':
         ffmpeg_options = { 'shared': False }
@@ -362,8 +362,11 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', None, {'force-cpp11': True}))
-    deps.append(('libsub', None, {'force-cpp11': True}))
+    # Let's use C++11 mode if we can
+    cpp_lib_options = {'force-cpp11': True} if target.platform == 'osx' and target.bits == 64 else {}
+
+    deps.append(('libdcp', None, cpp_lib_options))
+    deps.append(('libsub', None, cpp_lib_options))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
@@ -375,8 +378,7 @@ def dependencies(target):
 
     return deps
 
-def option_defaults():
-    return { "gui": True, "variant": None, "disk": False }
+option_defaults = { "gui": True, "variant": None, "disk": False }
 
 def configure_options(target, options):
     opt = ''