diff options
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | wscript | 9 |
2 files changed, 2 insertions, 11 deletions
@@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net> +# Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> # # This file is part of libdcp. # @@ -47,8 +47,6 @@ 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-gcov --disable-tests' if target.version == 'xp': @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net> +# Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> # # This file is part of libdcp. # @@ -185,13 +185,6 @@ def configure(conf): if not conf.options.disable_gcov: conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False) - # libxml++ 2.39.1 and later must be built with -std=c++11 - libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH) - s = libxmlpp_version.split('.') - v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) - if v >= 0x022701: - conf.env.append_value('CXXFLAGS', '-std=c++11') - def build(bld): create_version_cc(bld, VERSION) |