X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ae748ac07df3cb8ee220d6d59e2aabbf474ce862;hb=d1addc203597a892c02bd162585c6a55950ffaf5;hp=61dd60c0690e5ebd609f938a08c0504174be0a57;hpb=3c205603ded9c1c45048a59a25880a698c4a0e49;p=dcpomatic.git diff --git a/cscript b/cscript index 61dd60c06..ae748ac07 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', @@ -112,11 +111,10 @@ deb_depends['20.10'].extend(['libboost-filesystem1.71.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-gtk3-0v5', - 'libicu66', - 'libnettle7', + 'libicu67', + 'libnettle8', 'libssh-4', - 'libx264-155', + 'libx264-160', 'libcurl4', 'libpulse0', 'libxerces-c3.2', @@ -375,8 +373,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', 'c81a5f9', cpp_lib_options)) + deps.append(('libsub', 'ca2b17d', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we @@ -741,7 +739,10 @@ def make_manual(target): def test(target, options, test): target.set('LC_ALL', 'C') - cmd = 'run/tests ' + if target.platform == 'windows': + cmd = 'run\\tests' + else: + cmd = 'run/tests ' if target.debug: cmd += '--backtrace ' if test is not None: