X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=9b8ba84f7301deea33082cbf5c4807e0a90dc9f2;hb=bc7089956cefc9f8528918f8a5d48174ab680f13;hp=96cbfa84aefae7ef491b6d9b9049c9ae60f1c924;hpb=42cebebffa7d71b93ced7902062eed977c6b4e94;p=libdcp.git diff --git a/cscript b/cscript index 96cbfa84..9b8ba84f 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', 'v0.13.0'), ('openjpeg-cdist', '5d8bffd')) + return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.0')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory @@ -9,10 +9,10 @@ def build(target, options): cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' - if target.distro == 'debian' and target.version == 'unstable': + if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'): target.append_with_space('CXXFLAGS', '-std=c++11') elif target.platform == 'windows': - cmd += ' --target-windows --disable-tests' + cmd += ' --target-windows --disable-gcov' elif target.platform == 'osx': cmd += ' --disable-tests'