Alway build with --enable-disk if we can, regardless of any cscript option.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 1f2ec62a92f2346896399274a85cb7386ca958e9..cbbfa02a2b9305d70d55fdcb63a2030decd8bbdc 100644 (file)
--- a/cscript
+++ b/cscript
@@ -362,10 +362,13 @@ def dependencies(target, options):
         deps = []
 
     # Let's use C++11 mode if we can
-    cpp_lib_options = {'force-cpp11': True} if target.platform == 'osx' and target.bits == 64 else {}
+    cpp_lib_options = {'force-cpp11': True} if (
+            (target.platform == 'osx' and target.bits == 64) or
+            (target.platform == 'windows')) else {}
 
     deps.append(('libdcp', None, cpp_lib_options))
     deps.append(('libsub', None, cpp_lib_options))
+    deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
@@ -377,7 +380,7 @@ def dependencies(target, options):
 
     return deps
 
-option_defaults = { "gui": True, "variant": None, "disk": False }
+option_defaults = { "gui": True, "variant": None }
 
 def configure_options(target, options):
     opt = ''
@@ -415,7 +418,7 @@ def configure_options(target, options):
     if target.debug and target.platform == 'windows':
         opt += ' --static-dcpomatic'
 
-    if can_build_disk(target) and options['disk']:
+    if can_build_disk(target):
        opt += ' --enable-disk'
 
     return opt
@@ -672,10 +675,10 @@ def package(target, version, options):
             elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
                 return package_rpm(target, cpu, version, options)
     elif target.platform == 'osx' and target.bits is None:
-        target.command('bash platform/osx/make_dmg.sh %s %s universal %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+        target.command('bash platform/osx/make_dmg.sh %s %s universal no %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
         return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
     elif target.platform == 'osx' and target.bits == 64:
-        target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+        target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s %s' % (target.environment_prefix, target.directory, "yes" if options['disk'] else "no", target.apple_id, target.apple_password))
         return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
     elif target.platform == 'docker':
         shutil.copyfile(target.deb, 'build/platform/docker')