X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=28a57207553efb05505ce42a9e05bcd3225255bf;hb=84971422981ff638183f9098895692bdb9c9a7f4;hp=2e52267cd9cfbeec847455a0e2c55be7f696499b;hpb=88d217034d58a02514eedbccd88dbfa2f80a9cc2;p=dcpomatic.git

diff --git a/cscript b/cscript
index 2e52267cd..28a572075 100644
--- a/cscript
+++ b/cscript
@@ -93,7 +93,6 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip5',
-                             'libwxgtk3.0-gtk3-0v5',
                              'libicu66',
                              'libnettle7',
                              'libssh-4',
@@ -375,8 +374,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', 'b4e1d9f', cpp_lib_options))
-    deps.append(('libsub', 'b6377ae', cpp_lib_options))
+    deps.append(('libdcp', 'd08f689', cpp_lib_options))
+    deps.append(('libsub', '8f67794', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
@@ -739,12 +738,14 @@ def make_manual(target):
     target.command('pdflatex colour.tex')
     return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]
 
-def test(target, test):
-    if target.platform != 'windows':
-        target.set('LC_ALL', 'C')
+def test(target, options, test):
+    target.set('LC_ALL', 'C')
+    if target.platform == 'windows':
+        cmd = 'run\\tests'
+    else:
         cmd = 'run/tests '
-        if target.debug:
-            cmd += '--backtrace '
-        if test is not None:
-            cmd += '--run_test=%s' % test
-        target.command(cmd)
+    if target.debug:
+        cmd += '--backtrace '
+    if test is not None:
+        cmd += '--run_test=%s' % test
+    target.command(cmd)