projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
078537d
)
Missing openjp2 static dep for libdcp.
author
Carl Hetherington
<cth@carlh.net>
Fri, 4 Dec 2015 23:50:13 +0000
(23:50 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 4 Dec 2015 23:50:13 +0000
(23:50 +0000)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 688ebc681a2fbaa50784cfd1471a95eab16067d2..596d3a09757d70b3fe220b6589992d7cc0f9daae 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-239,7
+239,7
@@
def configure(conf):
if conf.options.static_dcp:
conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
if conf.options.static_dcp:
conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
- conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
+ conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0'
, 'openjp2'
]
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)