summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-31 15:54:35 +0000
committerCarl Hetherington <cth@carlh.net>2016-10-31 15:54:35 +0000
commitea8536b2c41c500bbc5bb82c54e4abf73fbb1038 (patch)
treebd2ccb080dcbdcf1ad4868d41e929b63650f0453
parentf692c95bbd48c97da8a1b1aedbba6a23d3559185 (diff)
Use release version of libcxml.
-rw-r--r--cscript4
-rw-r--r--wscript2
2 files changed, 3 insertions, 3 deletions
diff --git a/cscript b/cscript
index 939de06c..82f4b2bd 100644
--- a/cscript
+++ b/cscript
@@ -35,9 +35,9 @@ import os
def dependencies(target):
if target.platform == 'windows' and target.version == 'xp':
- return (('libcxml', 'c1348c5'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', '213c9f8'))
+ return (('libcxml', 'v0.15.2'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', '213c9f8'))
else:
- return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '213c9f8'))
+ return (('libcxml', 'v0.15.2'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '213c9f8'))
def build(target, options):
cmd = './waf configure --disable-examples --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index bbff5a46..ffc08bf4 100644
--- a/wscript
+++ b/wscript
@@ -126,7 +126,7 @@ def configure(conf):
elif conf.options.jpeg == 'oj1':
conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
- conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True)
if conf.options.target_windows:
boost_lib_suffix = '-mt'