X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=7ab2773e7c958d88f2bc65b51fb1e48e1773f59d;hb=d27d0f88a526cfe55e6018f9f32d54d5b61fc634;hp=f7e8e1bfdae05334c8c8f03d731161699c036a36;hpb=197a0bc8aa2ab25bd831fc9d4da99feb7fee8050;p=libdcp.git

diff --git a/cscript b/cscript
index f7e8e1bf..7ab2773e 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.8', options),
+        ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
+        ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f')
+    )
 
 def build(target, options):
     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'