Alway build with --enable-disk if we can, regardless of any cscript option. v2.15.54
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2020 22:49:03 +0000 (00:49 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2020 22:49:03 +0000 (00:49 +0200)
cscript

diff --git a/cscript b/cscript
index b10a7fc829e120c190b981dfb088cea156730213..cbbfa02a2b9305d70d55fdcb63a2030decd8bbdc 100644 (file)
--- a/cscript
+++ b/cscript
@@ -380,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 = ''
@@ -418,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