diff options
| author | David Robillard <d@drobilla.net> | 2011-09-29 19:17:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-09-29 19:17:54 +0000 |
| commit | 723ab60b39aed9a9190e047fc5803c1f4e1adac3 (patch) | |
| tree | adc9e942f41ef0bab10a89ede541fcc2023faae5 /libs/vamp-plugins | |
| parent | 426d3d8207881b3e84ea8e770ec7118f04c57771 (diff) | |
Upgrade to waf 1.6.7 and autowaf r52.
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/vamp-plugins')
| -rw-r--r-- | libs/vamp-plugins/wscript | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index 4fde44ea34..4ec6c198b3 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Version of this package (even if built as a child) @@ -16,10 +16,10 @@ APPNAME = 'libardourvampplugins' VERSION = LIBARDOURVAMPPLUGINS_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -27,11 +27,11 @@ def configure(conf): conf.check_tool('compiler_cxx') autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False) - conf.write_config_header('libvampplugins-config.h') + conf.write_config_header('libvampplugins-config.h', remove=False) def build(bld): # Library - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' plugins.cpp AmplitudeFollower.cpp @@ -40,12 +40,12 @@ def build(bld): SpectralCentroid.cpp ZeroCrossing.cpp ''' - obj.export_incdirs = ['.'] + obj.export_includes = ['.'] obj.includes = ['.'] obj.name = 'libardourvampplugins' obj.target = 'ardourvampplugins' obj.uselib = 'FFTW3F' - obj.uselib_local = 'libvampplugin libqmdsp' + obj.use = 'libvampplugin libqmdsp' if bld.env['HAVE_AUBIO']: obj.source += ' Onset.cpp ' obj.uselib += ' AUBIO ' |