Revert "Fix static build."
authorCarl Hetherington <cth@carlh.net>
Tue, 20 May 2014 20:41:18 +0000 (21:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 20 May 2014 20:41:18 +0000 (21:41 +0100)
This reverts commit 3bf376a8e2ca0464f483c8c8b18192874b2f007d.

wscript

diff --git a/wscript b/wscript
index 5bb4b728d482a9a3926034d26ad5b9786802d46b..71eeb06ceb66c1d448012a2e69abc0308f8d0cbb 100644 (file)
--- a/wscript
+++ b/wscript
@@ -54,7 +54,7 @@ def dynamic_openjpeg(conf):
 def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
     conf.check_cfg(package='libdcp', atleast_version='0.92', 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', 'asdcp-libdcp', 'kumu-libdcp']
     conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
 
     if static_boost: