X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=9e7ba447dc863c9c5ed9f80719ea47e6de4b1a85;hb=9121eb64810e39ba356d4a1b723a720adc82c096;hp=ae748ac07df3cb8ee220d6d59e2aabbf474ce862;hpb=b639b7b20f1ab341194bcd5c76700ca419254d11;p=dcpomatic.git diff --git a/cscript b/cscript index ae748ac07..9e7ba447d 100644 --- a/cscript +++ b/cscript @@ -285,9 +285,6 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_playlist', file=f) print('%{_bindir}/dcpomatic2_openssl', file=f) print('%{_bindir}/dcpomatic2_combiner', file=f) - if options['variant'] == 'swaroop-studio': - print('%{_bindir}/dcpomatic2_ecinema', file=f) - print('%{_bindir}/dcpomatic2_uuid', file=f) if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): print('%{_bindir}/dcpomatic2_disk', file=f) print('%{_bindir}/dcpomatic2_disk_writer', file=f) @@ -373,8 +370,8 @@ def dependencies(target, options): (target.platform == 'osx' and target.bits == 64) or (target.platform == 'windows')) else {} - deps.append(('libdcp', 'c81a5f9', cpp_lib_options)) - deps.append(('libsub', 'ca2b17d', cpp_lib_options)) + deps.append(('libdcp', 'c9865a3', cpp_lib_options)) + deps.append(('libsub', 'b0413a7', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we @@ -740,11 +737,11 @@ def make_manual(target): def test(target, options, test): target.set('LC_ALL', 'C') if target.platform == 'windows': - cmd = 'run\\tests' + cmd = 'run\\tests ' else: cmd = 'run/tests ' if target.debug: cmd += '--backtrace ' if test is not None: - cmd += '--run_test=%s' % test + cmd += '-t %s' % test target.command(cmd)