aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-08-08 21:01:41 +0000
committerDavid Robillard <d@drobilla.net>2012-08-08 21:01:41 +0000
commit5a8f20f5a7b818e8e9d0be7f24f232bed0078834 (patch)
tree1f5df1609a0e719773a788699845356becd5af36
parent409a3d0d0cd2bd5fb5af13ee64a4f138827043b0 (diff)
downloadlv2-5a8f20f5a7b818e8e9d0be7f24f232bed0078834.tar.xz
Move MSVC C99 gunk into autowaf.
-rw-r--r--plugins/eg-amp.lv2/wscript6
-rw-r--r--plugins/eg-sampler.lv2/wscript6
-rw-r--r--plugins/eg-synth.lv2/wscript6
-rwxr-xr-xwafbin71802 -> 93483 bytes
-rw-r--r--wscript5
5 files changed, 4 insertions, 19 deletions
diff --git a/plugins/eg-amp.lv2/wscript b/plugins/eg-amp.lv2/wscript
index 0a634f5..33951a1 100644
--- a/plugins/eg-amp.lv2/wscript
+++ b/plugins/eg-amp.lv2/wscript
@@ -17,13 +17,9 @@ def options(opt):
def configure(conf):
conf.load('compiler_c')
autowaf.configure(conf)
+ autowaf.set_c99_mode(conf)
autowaf.display_header('Amp Configuration')
- if conf.env.MSVC_COMPILER:
- conf.env.append_unique('CFLAGS', ['-TP', '-MD'])
- else:
- conf.env.append_unique('CFLAGS', '-std=c99')
-
if not autowaf.is_child():
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2')
diff --git a/plugins/eg-sampler.lv2/wscript b/plugins/eg-sampler.lv2/wscript
index fefa089..d5c0cf0 100644
--- a/plugins/eg-sampler.lv2/wscript
+++ b/plugins/eg-sampler.lv2/wscript
@@ -17,13 +17,9 @@ def options(opt):
def configure(conf):
conf.load('compiler_c')
autowaf.configure(conf)
+ autowaf.set_c99_mode(conf)
autowaf.display_header('Sampler Configuration')
- if conf.env.MSVC_COMPILER:
- conf.env.append_unique('CFLAGS', ['-TP', '-MD'])
- else:
- conf.env.append_unique('CFLAGS', '-std=c99')
-
if not autowaf.is_child():
autowaf.check_pkg(conf, 'lv2', atleast_version='0.2.0', uselib_store='LV2')
diff --git a/plugins/eg-synth.lv2/wscript b/plugins/eg-synth.lv2/wscript
index 170a77b..2069d03 100644
--- a/plugins/eg-synth.lv2/wscript
+++ b/plugins/eg-synth.lv2/wscript
@@ -17,13 +17,9 @@ def options(opt):
def configure(conf):
conf.load('compiler_c')
autowaf.configure(conf)
+ autowaf.set_c99_mode(conf)
autowaf.display_header('Synth Configuration')
- if conf.env.MSVC_COMPILER:
- conf.env.append_unique('CFLAGS', ['-TP', '-MD'])
- else:
- conf.env.append_unique('CFLAGS', '-std=c99')
-
if not autowaf.is_child():
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2')
diff --git a/waf b/waf
index e4f6524..d4671db 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index d27c73b..fe00f66 100644
--- a/wscript
+++ b/wscript
@@ -41,10 +41,7 @@ def configure(conf):
Options.options.no_plugins = True
autowaf.configure(conf)
- if conf.env.MSVC_COMPILER:
- conf.env.append_unique('CFLAGS', ['-TP', '-MD'])
- else:
- conf.env.append_unique('CFLAGS', '-std=c99')
+ autowaf.set_c99_mode(conf)
if Options.platform == 'win32' or not hasattr(os.path, 'relpath'):
Logs.warn('System does not support linking headers, copying')