Collect subtitles at the same time before emitting them from

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index aa274e8ecef8bf0362e4a97dea2471b9ba4090e9..043aba64ce9cfbcc95e5415d8f8b03a315059042 100644 (file)
--- a/cscript
+++ b/cscript
@@ -334,6 +334,11 @@ def option_defaults():
 
 def configure_options(target, options):
     opt = ''
+
+    if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
+        # Currently we only build tests on Ubuntu 1{6,8}.04
+        opt += ' --disable-tests'
+
     if target.debug:
         opt += ' --enable-debug'
     if target.platform == 'windows':
@@ -341,7 +346,6 @@ def configure_options(target, options):
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
-            opt += ' --disable-tests'
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':