diff options
| author | Nils Philippsen <nils@tiptoe.de> | 2016-08-14 23:49:53 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-10-04 22:03:28 +0200 |
| commit | 0aaded531828a2885bdaa3f3715062f069d738a3 (patch) | |
| tree | 0592af7a76081cec3f1f97363dd0d07a4caf2a41 /libs | |
| parent | ca90e56532864185b5e9b92e8972dd1338a62a00 (diff) | |
allow linking unbundled version of qm-dsp
In the course, rename the bundled, built version libqm-dsp so it matches
packaged versions.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/qm-dsp/wscript | 15 | ||||
| -rw-r--r-- | libs/vamp-plugins/wscript | 4 |
2 files changed, 13 insertions, 6 deletions
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'] diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index f7f64af53f..e2dd0f2e68 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -50,8 +50,8 @@ def build(bld): obj.includes = ['.'] obj.name = 'libardourvampplugins' obj.target = 'ardourvampplugins' - obj.uselib = 'FFTW3F VAMPSDK' - obj.use = 'libvampplugin libqmdsp' + obj.uselib = 'FFTW3F VAMPSDK QMDSP' + obj.use = 'libvampplugin libqm-dsp' autowaf.ensure_visible_symbols (obj, True) if bld.is_defined('HAVE_AUBIO4'): obj.source += ' Onset.cpp ' |