From 0aaded531828a2885bdaa3f3715062f069d738a3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 14 Aug 2016 23:49:53 +0200 Subject: allow linking unbundled version of qm-dsp In the course, rename the bundled, built version libqm-dsp so it matches packaged versions. --- libs/qm-dsp/wscript | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libs/qm-dsp') diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index ef15abffb7..33556f1da6 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -23,10 +23,17 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + if conf.is_defined('USE_EXTERNAL_LIBS'): + conf.check_cxx(header_name="base/Pitch.h", mandatory=True) + conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True) + else: + conf.load('compiler_cxx') + autowaf.configure(conf) def build(bld): + if bld.is_defined('USE_EXTERNAL_LIBS'): + return + # Host Library obj = bld(features = 'cxx cxxshlib') obj.source = ''' @@ -50,8 +57,8 @@ def build(bld): autowaf.ensure_visible_symbols (obj, True) obj.export_includes = ['.'] obj.includes = ['.'] - obj.name = 'libqmdsp' - obj.target = 'qmdsp' + obj.name = 'libqm-dsp' + obj.target = 'qm-dsp' obj.vnum = QM_DSP_VERSION obj.install_path = bld.env['LIBDIR'] -- cgit v1.2.3