summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-03-01 19:53:20 +0000
committerCarl Hetherington <cth@carlh.net>2016-03-01 19:53:20 +0000
commitd86caa84091d890fde8131d0c595c1360856b733 (patch)
tree389401ccaae7f5abff2809b0effb8f79e7ddc995
parente3a57613aaf747751c6834faf4d147207aa229fc (diff)
Update deps; there is no dependency on libdcp after all, it would seem.
-rw-r--r--cscript2
-rw-r--r--wscript6
2 files changed, 4 insertions, 4 deletions
diff --git a/cscript b/cscript
index 3dff9f5..1482977 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
import os
def dependencies(target):
- return (('libdcp', '45841f3'), ('asdcplib-cth', 'cth'))
+ return (('asdcplib-cth', 'v0.1.0'), ('libcxml', '0.15.1'))
def build(target, options):
cmd = './waf configure --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index 2dc6682..8c94121 100644
--- a/wscript
+++ b/wscript
@@ -41,8 +41,8 @@ def configure(conf):
conf.env.LIB_ASDCPLIB_CTH = ['ssl', 'crypto']
conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
else:
- conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
- conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', 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='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
boost_lib_suffix = ''
if conf.env.TARGET_WINDOWS:
@@ -96,7 +96,7 @@ def configure(conf):
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)