Bump libdcp for warnings fix.

[libsub.git] / wscript

diff --git a/wscript b/wscript
index 8b5169b1241c98fc5082f08e26d58481ba38bdab..c5b8019644eab443b7bd1acb5ef7354927dfe0a3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -82,6 +82,7 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
+    conf.load('clang_compilation_database', tooldir=['waf-tools'])
     conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS'])
     if conf.options.force_cpp11:
         conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
@@ -93,6 +94,11 @@ def configure(conf):
     conf.env.DISABLE_TESTS = conf.options.disable_tests
     conf.env.API_VERSION = API_VERSION
 
+    if conf.options.target_windows:
+        conf.env.append_value('CXXFLAGS', '-DLIBSUB_WINDOWS')
+    else:
+        conf.env.append_value('CXXFLAGS', '-DLIBSUB_POSIX')
+
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', '-g')
     else:
@@ -110,7 +116,7 @@ def configure(conf):
         conf.env.STLIB_CXML = ['cxml']
         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-cth', 'kumu-cth', 'openjp2']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
         conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1']
     else:
         conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)