import os
import shutil
-option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' }
+option_defaults = { 'jpeg': 'oj2' }
def dependencies(target, options):
- libcxml = ('libcxml', '2b8b650', {'force-cpp11': options['force-cpp11']})
+ libcxml = ('libcxml', 'v0.17.0')
if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
else:
- return (libcxml, ('openjpeg', '956af06'), ('asdcplib', 'carl'))
+ return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
def build(target, options):
cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
if target.version == 'xp':
# OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
cmd += ' --jpeg=oj1'
- elif target.platform == 'osx':
- cmd += ' --disable-tests'
if target.debug:
cmd += ' --enable-debug'
- # Centos 7 ships with glibmm 2.50.0 which requires C++11
- # but its compiler (gcc 4.8.5) defaults to C++97. Go figure.
- # I worry that this will cause ABI problems but I don't have
- # a better solution. Mageia 6 pulls the same stunt except it's
- # libxml++ that requires C++11
- force_cpp11 = False
- if target.platform == 'linux':
- if target.distro == 'centos' and target.version == '7':
- force_cpp11 = True
- if target.distro == 'mageia' and target.version == '6':
- force_cpp11 = True
- if force_cpp11 or options['force-cpp11']:
- cmd += ' --force-cpp11'
-
target.command(cmd)
target.command('./waf build install')