X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=dc145f0b618e52e57a31dfa9835311c94e015928;hb=096b175a661234d9e02a852cce9f56c4577b8259;hp=a934965510dca0ce14a341097902273042e4d86b;hpb=82755760ae1d27dc613a12ebfa05b3ee360f8234;p=libdcp.git diff --git a/cscript b/cscript index a9349655..dc145f0b 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', '0f4ca5d'), ('openjpeg-cdist', '5d8bffd')) + return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.1')) 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'