More attempts to fix spaces in filenames.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 510fc44d886972b95a1061b7c52e2e6701081ba5..f258f5dfe7b9dd1f1d9b119797fb4d6ffd275295 100644 (file)
--- 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,10 +362,8 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    cpp_lib_options = {}
-    if target.platform == 'osx' and target.bits == 64:
-        # We can use C++11 mode, so let's do it.
-        options['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))
@@ -380,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 = ''