projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4b28be
)
Fix build on Windows with no options.
author
Carl Hetherington
<cth@carlh.net>
Mon, 24 Jul 2017 11:12:50 +0000
(12:12 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 24 Jul 2017 11:12:50 +0000
(12:12 +0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 33e804a3c407891b3fc444357260b4eedc2f7ecc..c9ba6d33e2be789b023d04260d36c7ac334977d6 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-34,7
+34,7
@@
import os
def dependencies(target, options):
import os
def dependencies(target, options):
- if (target.platform == 'windows' and target.version == 'xp') or ('jpeg' in options and options['jpeg'] == 'oj1'):
+ if (target.platform == 'windows' and target.version == 'xp') or (
options is not None and
'jpeg' in options and options['jpeg'] == 'oj1'):
return (('libcxml', '25e945f'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'f3b0fb8'))
else:
return (('libcxml', '25e945f'), ('openjpeg2-cdist', '8ea62cc'), ('asdcplib-cth', 'f3b0fb8'))
return (('libcxml', '25e945f'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'f3b0fb8'))
else:
return (('libcxml', '25e945f'), ('openjpeg2-cdist', '8ea62cc'), ('asdcplib-cth', 'f3b0fb8'))