allow linking unbundled version of qm-dsp

In the course, rename the bundled, built version libqm-dsp so it matches
packaged versions.

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index ef15abffb73805454b9bed95ac12d6b64c8351a7..33556f1da679620a3aac7d82700bd270e34c1074 100644 (file)
--- 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 f7f64af53fadcfc0718a528f282feb7998d61f29..e2dd0f2e680358a48d2d1ae377726be4661c8dbe 100644 (file)
--- 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 '

diff --git a/wscript b/wscript
index 9edfde8a8cfab7258997a63d5d0cae3571589da6..cccb38929a01fb2ccf7b63c00a9b499dc8d6695c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -773,6 +773,10 @@ def options(opt):
                     help='Turn on PT session import option')
     opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews',
                     help='Disable threaded waveview rendering')
+    opt.add_option(
+        '--qm-dsp-include', type='string', action='store',
+        dest='qm_dsp_include', default='/usr/include/qm-dsp',
+        help='directory where the header files of qm-dsp can be found')
 
     for i in children:
         opt.recurse(i)
@@ -933,6 +937,8 @@ def configure(conf):
 
     if Options.options.use_external_libs:
         conf.define('USE_EXTERNAL_LIBS', 1)
+        conf.env.append_value(
+            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
 
     if Options.options.boost_include != '':
         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)