Remove erroneous wxFD_MULTIPLE flag.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 0f8241c494b1ab66ac275d2b6dcb1803ed4c2872..41f98b135226a74ec90b5486656c17832c915cd5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -370,8 +370,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'b221efe'))
-    deps.append(('libsub', '4518eac'))
+    deps.append(('libdcp', 'bed820d'))
+    deps.append(('libsub', '2ac27e6'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -390,10 +390,10 @@ option_defaults = { "gui": True, "variant": None }
 def configure_options(target, options):
     opt = ' --warnings-are-errors'
 
-    if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+    if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ('16.04', '18.04')) or
             (target.platform == 'osx') or
             (target.platform == 'windows')):
-        # Currently we only build tests on Ubuntu 18.04, macOS and Windows
+        # Currently we only build tests on Ubuntu {16,18}.04, macOS and Windows
         opt += ' --disable-tests'
 
     if target.debug:
@@ -407,13 +407,6 @@ def configure_options(target, options):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi'
-                # Centos 7 ships with glibmm 2.50.0 which requires C++11
-                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-                # I worry that this will cause ABI problems but I don't have
-                # a better solution.
-                opt += ' --force-cpp11'
-    elif target.platform == 'osx':
-        opt += ' --force-cpp11'
 
     if not options['gui']:
         opt += ' --disable-gui'