From 982607ad3a06aad0e15e6fa9d474eafc5ada3ea2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 5 Sep 2016 21:29:27 -0400 Subject: Fix bundle installation directory --- plugins/eg-amp.lv2/wscript | 2 ++ plugins/eg-fifths.lv2/wscript | 2 ++ plugins/eg-metro.lv2/wscript | 2 ++ plugins/eg-midigate.lv2/wscript | 2 ++ plugins/eg-params.lv2/wscript | 2 ++ plugins/eg-sampler.lv2/wscript | 2 ++ plugins/eg-scope.lv2/wscript | 2 ++ wscript | 8 ++++---- 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/plugins/eg-amp.lv2/wscript b/plugins/eg-amp.lv2/wscript index 96152c1..205fece 100644 --- a/plugins/eg-amp.lv2/wscript +++ b/plugins/eg-amp.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Amp Configuration') diff --git a/plugins/eg-fifths.lv2/wscript b/plugins/eg-fifths.lv2/wscript index 811634e..ce8157e 100644 --- a/plugins/eg-fifths.lv2/wscript +++ b/plugins/eg-fifths.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Fifths Configuration') diff --git a/plugins/eg-metro.lv2/wscript b/plugins/eg-metro.lv2/wscript index 515dd6c..3402a3f 100644 --- a/plugins/eg-metro.lv2/wscript +++ b/plugins/eg-metro.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Metro Configuration') diff --git a/plugins/eg-midigate.lv2/wscript b/plugins/eg-midigate.lv2/wscript index 16c8e5e..80f12bb 100644 --- a/plugins/eg-midigate.lv2/wscript +++ b/plugins/eg-midigate.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Midigate Configuration') diff --git a/plugins/eg-params.lv2/wscript b/plugins/eg-params.lv2/wscript index a26c856..219118a 100644 --- a/plugins/eg-params.lv2/wscript +++ b/plugins/eg-params.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Params Configuration') diff --git a/plugins/eg-sampler.lv2/wscript b/plugins/eg-sampler.lv2/wscript index 3a6f472..3032953 100644 --- a/plugins/eg-sampler.lv2/wscript +++ b/plugins/eg-sampler.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Sampler Configuration') diff --git a/plugins/eg-scope.lv2/wscript b/plugins/eg-scope.lv2/wscript index a61af33..74277c3 100644 --- a/plugins/eg-scope.lv2/wscript +++ b/plugins/eg-scope.lv2/wscript @@ -12,10 +12,12 @@ out = 'build' def options(opt): opt.load('compiler_c') + opt.load('lv2') autowaf.set_options(opt) def configure(conf): conf.load('compiler_c') + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) autowaf.display_header('Scope Configuration') diff --git a/wscript b/wscript index 4becd48..417b959 100644 --- a/wscript +++ b/wscript @@ -38,19 +38,19 @@ def options(opt): opt.recurse('lv2/lv2plug.in/ns/lv2core') def configure(conf): - conf.load('lv2') try: conf.load('compiler_c') except: Options.options.build_tests = False Options.options.no_plugins = True - if Options.options.online_docs: - Options.options.docs = True - + conf.load('lv2') autowaf.configure(conf) autowaf.set_c99_mode(conf) + if Options.options.online_docs: + Options.options.docs = True + if Options.options.ultra_strict: conf.env.append_value('CFLAGS', ['-Wconversion']) -- cgit v1.2.1