From 1ec3031dfaf229b9b598216f1a1d92254cbc163a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 17 Apr 2012 03:13:49 +0000 Subject: Compile as C++ in MSVC. --- plugins/eg-amp.lv2/wscript | 9 ++++++--- plugins/eg-sampler.lv2/wscript | 10 ++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/plugins/eg-amp.lv2/wscript b/plugins/eg-amp.lv2/wscript index 9ff2912..8a66de3 100644 --- a/plugins/eg-amp.lv2/wscript +++ b/plugins/eg-amp.lv2/wscript @@ -21,11 +21,14 @@ def configure(conf): autowaf.configure(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, 'lv2core', uselib_store='LV2CORE') - conf.env.append_value('CFLAGS', '-std=c99') - # Set env['pluginlib_PATTERN'] pat = conf.env['cshlib_PATTERN'] if pat.startswith('lib'): @@ -63,7 +66,7 @@ def build(bld): includes = None if autowaf.is_child: includes = '../..' - + # Build plugin library obj = bld(features = 'c cshlib', env = penv, diff --git a/plugins/eg-sampler.lv2/wscript b/plugins/eg-sampler.lv2/wscript index 68400ce..edcce52 100644 --- a/plugins/eg-sampler.lv2/wscript +++ b/plugins/eg-sampler.lv2/wscript @@ -21,6 +21,11 @@ def configure(conf): autowaf.configure(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') @@ -29,8 +34,6 @@ def configure(conf): autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', atleast_version='2.18.0', mandatory=False) - conf.env.append_value('CFLAGS', '-std=c99') - # Set env['pluginlib_PATTERN'] pat = conf.env['cshlib_PATTERN'] if pat.startswith('lib'): @@ -38,8 +41,7 @@ def configure(conf): conf.env['pluginlib_PATTERN'] = pat conf.env['pluginlib_EXT'] = pat[pat.rfind('.'):] - autowaf.display_msg(conf, "LV2 bundle directory", - conf.env['LV2DIR']) + autowaf.display_msg(conf, "LV2 bundle directory", conf.env['LV2DIR']) print('') def build(bld): -- cgit v1.2.1