X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=f62065e8ff3b9c57556562777bd2e5176b59e82c;hb=f443c3161460c1b927ec9072fdc4e76a2f156cab;hp=78176a3a3c26c6889ed06cde0d79a41fe729a28b;hpb=81c45ece2d2ec3cb38739caa8a60b1305ca2eb39;p=libdcp.git

diff --git a/cscript b/cscript
index 78176a3a..f62065e8 100644
--- a/cscript
+++ b/cscript
@@ -35,18 +35,25 @@ import os
 import shutil
 
 def dependencies(target, options):
-    return (('libcxml', 'v0.17.5'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
+    return (
+        ('libcxml', 'v0.17.9', options),
+        ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
+        ('asdcplib', '4b5d6e8d27dfd5fb282590538068662f4dbbf1c9')
+    )
 
 def build(target, options):
-    cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
+    cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
     if target.platform == 'linux':
         cmd += ' --static'
-        if not (target.distro == 'ubuntu' and target.version == '18.04'):
-            # We only build tests on Ubuntu 18.04
+        if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
+            # We only build tests on Ubuntu 16.04 and 22.04
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
         cmd += f' --target-windows-{target.bits}'
 
+    if 'c++17' in options and options['c++17']:
+        cmd += ' --c++17'
+
     if target.debug:
         cmd += ' --enable-debug'