merge 2.0-ongoing into 3.0 @ 3581 - 3710

git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 21:27:39 +00:00
parent 68e943265e
commit c86210a9d5
51 changed files with 1230 additions and 713 deletions
--- a/libs/vamp-plugins/SConscript
+++ b/libs/vamp-plugins/SConscript
@@ -29,6 +29,9 @@ sources = plugin_files
 if vampplugs['AUBIO']:
    sources += aubio_files
    vampplugs.Merge ([libraries['aubio']])
+    vampplugs.Merge ([libraries['fftw3f']])
+else:
+    print 'WARNING: some VAMP plugins will not be built because this machine has no AUBIO support'

 libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', sources)