diff options
| author | David Robillard <d@drobilla.net> | 2012-08-06 19:36:46 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-08-06 19:36:46 +0000 |
| commit | 41a14d4a9a07d85b915737063102f401cf15d5c5 (patch) | |
| tree | d289031d6c6bbe2cfb3b44d6ba2aae9a1564bca3 | |
| parent | 99e626faf5667e3bd5501ef4642b8581c7eff9d6 (diff) | |
| download | lv2-41a14d4a9a07d85b915737063102f401cf15d5c5.tar.xz | |
Fix recursive building.
| -rw-r--r-- | plugins/eg-amp.lv2/wscript | 4 | ||||
| -rw-r--r-- | plugins/eg-synth.lv2/wscript | 4 | ||||
| -rw-r--r-- | wscript | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/plugins/eg-amp.lv2/wscript b/plugins/eg-amp.lv2/wscript index 52c2afc..d077f51 100644 --- a/plugins/eg-amp.lv2/wscript +++ b/plugins/eg-amp.lv2/wscript @@ -25,7 +25,7 @@ def configure(conf): conf.env.append_unique('CFLAGS', '-std=c99') if not autowaf.is_child(): - autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE') + autowaf.check_pkg(conf, 'lv2', uselib_store='LV2') autowaf.display_msg(conf, "LV2 bundle directory", conf.env['LV2DIR']) print('') @@ -63,7 +63,7 @@ def build(bld): name = 'amp', target = '%s/amp' % bundle, install_path = '${LV2DIR}/%s' % bundle, - uselib = 'LV2CORE', + uselib = 'LV2', includes = includes) obj.env['cshlib_PATTERN'] = module_pat diff --git a/plugins/eg-synth.lv2/wscript b/plugins/eg-synth.lv2/wscript index 7c3cbba..5813fb8 100644 --- a/plugins/eg-synth.lv2/wscript +++ b/plugins/eg-synth.lv2/wscript @@ -25,7 +25,7 @@ def configure(conf): conf.env.append_unique('CFLAGS', '-std=c99') if not autowaf.is_child(): - autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE') + autowaf.check_pkg(conf, 'lv2', uselib_store='LV2') autowaf.display_msg(conf, "LV2 bundle directory", conf.env['LV2DIR']) print('') @@ -63,6 +63,6 @@ def build(bld): name = 'synth', target = '%s/synth' % bundle, install_path = '${LV2DIR}/%s' % bundle, - uselib = 'LV2CORE', + uselib = 'LV2', includes = includes) obj.env['cshlib_PATTERN'] = module_pat @@ -42,8 +42,6 @@ def configure(conf): Options.options.no_plugins = True autowaf.configure(conf) - conf.recurse('lv2/lv2plug.in/ns/lv2core') - if conf.env['MSVC_COMPILER']: conf.env.append_unique('CFLAGS', ['-TP', '-MD']) else: @@ -61,6 +59,10 @@ def configure(conf): if conf.env['BUILD_TESTS'] and not conf.is_defined('HAVE_GCOV'): conf.check_cc(lib='gcov', define_name='HAVE_GCOV', mandatory=False) + autowaf.set_recursive() + + conf.recurse('lv2/lv2plug.in/ns/lv2core') + if conf.env['BUILD_PLUGINS']: for i in conf.path.ant_glob('plugins/*', dir=True): try: |