aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-09-10 17:03:17 +0000
committerDavid Robillard <d@drobilla.net>2012-09-10 17:03:17 +0000
commit65d414ba5fc5eb03a5127ed0291a4d33c95343d2 (patch)
treeeaf11adcc829ff7fe07f56fd768937ba33755565
parent5e444484ad9d193f49db20297804d25f5d3f1c43 (diff)
downloadserd-65d414ba5fc5eb03a5127ed0291a4d33c95343d2.tar.gz
serd-65d414ba5fc5eb03a5127ed0291a4d33c95343d2.tar.bz2
serd-65d414ba5fc5eb03a5127ed0291a4d33c95343d2.zip
Update to r79/autowaf (Add --pardebug option for parallel-installable debug libraries with 'D' suffix).
git-svn-id: http://svn.drobilla.net/serd/trunk@392 490d8e77-9747-427b-9fa3-0b8f29cee8a0
-rwxr-xr-xwafbin72374 -> 72344 bytes
-rw-r--r--wscript18
2 files changed, 1 insertions, 17 deletions
diff --git a/waf b/waf
index 2fa6b8f7..c443af85 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index f38a1276..2078e1b4 100644
--- a/wscript
+++ b/wscript
@@ -90,13 +90,9 @@ def configure(conf):
mandatory = False)
autowaf.define(conf, 'SERD_VERSION', SERD_VERSION)
+ autowaf.set_lib_env(conf, 'serd', SERD_VERSION)
conf.write_config_header('serd_config.h', remove=False)
- # Set up env for building against local serd in case we are a child
- conf.env.INCLUDES_SERD = ['${INCLUDEDIR}/serd-%s' % SERD_MAJOR_VERSION]
- conf.env.LIBPATH_SERD = [conf.env.LIBDIR]
- conf.env.LIB_SERD = ['serd-%s' % SERD_MAJOR_VERSION];
-
autowaf.display_msg(conf, 'Utilities', str(conf.env.BUILD_UTILS))
autowaf.display_msg(conf, 'Unit tests', str(conf.env.BUILD_TESTS))
print('')
@@ -110,18 +106,6 @@ lib_source = [
'src/writer.c',
]
-import sys
-from waflib.TaskGen import feature, before
-@feature('c')
-@before('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