merge with master, primarily for adrian's maximise-mixer change

[ardour.git] / libs / vamp-plugins / wscript

diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 59823b0b2f9702a98dbaa60c9dd7b2d82dfb8d38..4808d33612d98ec48bf6e0788b41355fe8d5e1fd 100644 (file)
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -26,7 +26,10 @@ def configure(conf):
     conf.load('compiler_cxx')
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
-    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False)
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
+                      atleast_version='0.3.2')
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO4',
+                      atleast_version='0.4.0', mandatory=False)
     conf.write_config_header('libvampplugins-config.h', remove=False)
 
 def build(bld):
@@ -44,9 +47,11 @@ def build(bld):
     obj.includes     = ['.']
     obj.name         = 'libardourvampplugins'
     obj.target       = 'ardourvampplugins'
-    obj.uselib       = 'FFTW3F'
+    obj.uselib       = 'FFTW3F VAMPSDK'
     obj.use          = 'libvampplugin libqmdsp'
-    if bld.env['HAVE_AUBIO']:
+    obj.defines      = [ 'ARDOUR_VAMP_PLUGINS_DLL_EPORTS' ]
+    autowaf.ensure_visible_symbols (obj, True)
+    if bld.is_defined('HAVE_AUBIO'):
         obj.source += ' Onset.cpp '
         obj.uselib += ' AUBIO '
     obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION