diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-13 15:30:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-13 15:30:35 +0000 |
| commit | 89d891bfc20ce3f7929a72ce1c334fa4f00b2139 (patch) | |
| tree | 37746c749bfa3236a8b7d65a634cf89008a44ee7 /cscript | |
| parent | 7d7a93223e4dd32ca9bb1d7b1b2dd4fc4ea52be1 (diff) | |
| parent | dc31f6d229c0b0c3d953022594c8bb713ca5d72e (diff) | |
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', 'v0.14.0'), ('openjpeg-cdist', '5d8bffd')) + return (('libcxml', '5f7703a'), ('openjpeg-cdist', '5d8bffd')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory @@ -9,7 +9,7 @@ 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' |