X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=c5b8019644eab443b7bd1acb5ef7354927dfe0a3;hb=67fff3c615c6cdd168b7525502119777ea5ca386;hp=f30889aa0e82ebfb879fef1ce0d76a2fce3b3432;hpb=5a3faa7fe5c6cb94572645b7b81ae0393aede0eb;p=libsub.git

diff --git a/wscript b/wscript
index f30889a..c5b8019 100644
--- a/wscript
+++ b/wscript
@@ -26,11 +26,6 @@ APPNAME = 'libsub'
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
-if isinstance(this_version, bytes):
-    this_version = this_version.decode('UTF-8')
-if isinstance(last_version, bytes):
-    last_version = last_version.decode('UTF-8')
-
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
@@ -87,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'])
@@ -98,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:
@@ -109,17 +110,17 @@ def configure(conf):
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
 
     if conf.options.static:
-        conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True)
         conf.env.HAVE_CXML = 1
         conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z']
         conf.env.STLIB_CXML = ['cxml']
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags', uselib_store='DCP', mandatory=True)
+        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.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True)
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True)
 
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]