summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-08-08 21:14:20 +0000
committerDavid Robillard <d@drobilla.net>2012-08-08 21:14:20 +0000
commit9c66569caea968cea4e0dfd5a0730cd34f6565a7 (patch)
treee58fa15cd28da8b338c850c0a2751ed34c88b5a8
parent3762c45ac885e6c991acef64486f3841edda58fd (diff)
downloadsuil-9c66569caea968cea4e0dfd5a0730cd34f6565a7.tar.gz
suil-9c66569caea968cea4e0dfd5a0730cd34f6565a7.tar.bz2
suil-9c66569caea968cea4e0dfd5a0730cd34f6565a7.zip
Update to r74/autowaf (Add autowaf.set_c99_mode()).
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@4625 a436a847-0d15-0410-975c-d299462d15a1
-rwxr-xr-xwafbin72475 -> 94174 bytes
-rw-r--r--wscript14
2 files changed, 6 insertions, 8 deletions
diff --git a/waf b/waf
index 62ab137..45a6f80 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index 6a1b379..bc4d863 100644
--- a/wscript
+++ b/wscript
@@ -40,19 +40,17 @@ def configure(conf):
conf.load('compiler_cxx')
conf.line_just = 40
autowaf.configure(conf)
+ autowaf.set_c99_mode(conf)
autowaf.display_header('Suil Configuration')
conf.env.NODELETE_FLAGS = []
conf.env.BUILD_STATIC = Options.options.static
- if conf.env.MSVC_COMPILER:
- conf.env.append_unique('CFLAGS', ['-TP', '-MD'])
- else:
- conf.env.append_unique('CFLAGS', '-std=c99')
- if conf.check(linkflags = ['-Wl,-z,nodelete'],
- msg = 'Checking for link flags -Wl,-z,-nodelete',
- mandatory = False):
- conf.env.NODELETE_FLAGS = ['-Wl,-z,nodelete']
+ if (not conf.env.MSVC_COMPILER and
+ conf.check(linkflags = ['-Wl,-z,nodelete'],
+ msg = 'Checking for link flags -Wl,-z,-nodelete',
+ mandatory = False)):
+ conf.env.NODELETE_FLAGS = ['-Wl,-z,nodelete']
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2')