projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad5d78b
)
Bump libcxml to release version.
author
Carl Hetherington
<cth@carlh.net>
Thu, 5 Nov 2015 09:25:52 +0000
(09:25 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 5 Nov 2015 09:25:52 +0000
(09:25 +0000)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index a934965510dca0ce14a341097902273042e4d86b..24f8e156a9e0d384162e6ece622b703924c9d33e 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-1,7
+1,7
@@
import os
def dependencies(target):
import os
def dependencies(target):
- return (('libcxml', '
0f4ca5d
'), ('openjpeg-cdist', '5d8bffd'))
+ return (('libcxml', '
v0.14.0
'), ('openjpeg-cdist', '5d8bffd'))
def build(target, options):
cmd = './waf configure --disable-examples --prefix=%s' % target.directory
def build(target, options):
cmd = './waf configure --disable-examples --prefix=%s' % target.directory
diff --git
a/wscript
b/wscript
index 926aa4822963cf8073b61b35bdc8d2c1bb6cd346..0a56d22f01ad8bb5b33ce5f8d9849c97b6c2d681 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-68,7
+68,7
@@
def configure(conf):
conf.env.STLIB_CXML = ['cxml']
else:
conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True)
conf.env.STLIB_CXML = ['cxml']
else:
conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True)
- conf.check_cfg(package='libcxml', atleast_version='0.
08
', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.
14.0
', args='--cflags --libs', uselib_store='CXML', mandatory=True)
if conf.options.target_windows:
boost_lib_suffix = '-mt'
if conf.options.target_windows:
boost_lib_suffix = '-mt'