Small C++11 tweaks.

[libsub.git] / wscript

diff --git a/wscript b/wscript
index f15c0291cf6975d139979fabf522c5b1bae3e02b..c49f68da14ee883453dd5bdcce36b9df71b7f494 100644 (file)
--- a/wscript
+++ b/wscript
@@ -101,6 +101,9 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O3')
 
+    if not conf.env.TARGET_WINDOWS:
+        conf.env.append_value('LINKFLAGS', '-pthread')
+
     # Disable libxml++ deprecation warnings for now
     conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations'])
 
@@ -109,8 +112,8 @@ def configure(conf):
     if conf.options.static:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.HAVE_DCP = 1
-        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
-        conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2', 'cxml']
+        conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1', 'glibmm-2.4', 'xml++-2.6', 'xml2']
     else:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True)