From 5fa6979ae917474d8596e9a9526a9bfc6617341c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 10 Sep 2012 16:29:26 +0000 Subject: Build correct debug library names on MSVC. git-svn-id: http://svn.drobilla.net/serd/trunk@390 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- wscript | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index e166a7e6..3bab65e8 100644 --- a/wscript +++ b/wscript @@ -110,6 +110,18 @@ lib_source = [ 'src/writer.c', ] +import sys +from waflib.TaskGen import feature, before +@feature('c') +@before('process_source', 'apply_link') +def version_lib(self): + if sys.platform == 'win32': + self.vnum = None + if self.env['DEBUG']: + applicable = ['cshlib', 'cxxshlib', 'cstlib', 'cxxstlib'] + if [x for x in applicable if x in self.features]: + self.target = self.target + 'D' + def build(bld): # C Headers includedir = '${INCLUDEDIR}/serd-%s/serd' % SERD_MAJOR_VERSION @@ -122,13 +134,10 @@ def build(bld): libflags = ['-fvisibility=hidden'] libs = ['m'] defines = [] - lib_suff = '' if bld.env.MSVC_COMPILER: libflags = [] libs = [] defines = ['snprintf=_snprintf'] - if bld.env.DEBUG: - lib_suff = 'D' # Shared Library if bld.env.BUILD_SHARED: @@ -138,7 +147,7 @@ def build(bld): includes = ['.', './src'], lib = libs, name = 'libserd', - target = 'serd-%s%s' % (SERD_MAJOR_VERSION, lib_suff), + target = 'serd-%s' % SERD_MAJOR_VERSION, vnum = SERD_VERSION, install_path = '${LIBDIR}', defines = defines + ['SERD_SHARED', 'SERD_INTERNAL'], @@ -152,7 +161,7 @@ def build(bld): includes = ['.', './src'], lib = libs, name = 'libserd_static', - target = 'serd-%s%s' % (SERD_MAJOR_VERSION, lib_suff), + target = 'serd-%s' % SERD_MAJOR_VERSION, vnum = SERD_VERSION, install_path = '${LIBDIR}', defines = defines + ['SERD_INTERNAL']) -- cgit v1.2.1