X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cscript;h=dc145f0b618e52e57a31dfa9835311c94e015928;hb=f028e8a214ba2f6c10550c961bd13d20ddb1ffcc;hp=bca259a162076107ebe6529e563c07382d1db946;hpb=4852a22bc0002184916317be1f8ea2828a0869bd;p=libdcp.git diff --git a/cscript b/cscript index bca259a1..dc145f0b 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', 'e8003ee'), ('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,8 +9,10 @@ def build(target, options): cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' + 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'