summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-06-08 00:38:16 +0200
committerCarl Hetherington <cth@carlh.net>2020-06-08 00:38:16 +0200
commit9b2ca9bf225c36646287d1a2abb98e4470dfc204 (patch)
treeb0e550da4a359028433158c189da6aa97f769faa /cscript
parente57039a6993f7849b7fc0997dd62943ed1df477c (diff)
Try carl-2 on master.opt
Diffstat (limited to 'cscript')
-rw-r--r--cscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/cscript b/cscript
index 29e633d8..800b9515 100644
--- a/cscript
+++ b/cscript
@@ -39,9 +39,9 @@ option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' }
def dependencies(target, options):
libcxml = ('libcxml', '2b8b650', {'force-cpp11': options['force-cpp11']})
if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
- return (libcxml, ('openjpeg', 'f9924f0'), ('asdcplib', 'carl'))
+ return (libcxml, ('openjpeg', '87fbf83'), ('asdcplib', 'carl'))
else:
- return (libcxml, ('openjpeg', 'f9924f0'), ('asdcplib', 'carl'))
+ return (libcxml, ('openjpeg', '87fbf83'), ('asdcplib', 'carl'))
def build(target, options):
cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory