X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-sdk%2Fwscript;h=aa4dfdc1daadc4b0bf384ca4ea666ec89c264ebf;hb=1db2be2fef7a70f5200bcd96a701f612bbd7ec52;hp=2fbc31c666a6b97f0a6f9ccfd847d03e48b4a57a;hpb=6f907ad4c03c37e9835cddaff13beca85cb9343e;p=ardour.git

diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript
index 2fbc31c666..aa4dfdc1da 100644
--- a/libs/vamp-sdk/wscript
+++ b/libs/vamp-sdk/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,53 +16,52 @@ APPNAME = 'libvamp'
 VERSION = LIBVAMP_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
-	autowaf.set_options(opt)
+def options(opt):
+    autowaf.set_options(opt)
 
 def configure(conf):
-	autowaf.configure(conf)
-	autowaf.check_tool(conf, 'compiler_cxx')
-	autowaf.check_pkg(conf, 'fftw3', uselib_store='FFTW3', mandatory=True)
-	autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
-	conf.env.append_value('CXXFLAGS', '-DHAVE_FFTW3')
+    conf.load('compiler_cxx')
+    autowaf.configure(conf)
+    autowaf.check_pkg(conf, 'fftw3', uselib_store='FFTW3', mandatory=True)
+    autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
+    conf.env.append_value('CXXFLAGS', '-DHAVE_FFTW3')
 
 def build(bld):
-	# Host Library
-	obj = bld.new_task_gen('cxx', 'shlib')
-	obj.source = '''
-		src/vamp-hostsdk/PluginHostAdapter.cpp
-		src/vamp-hostsdk/PluginBufferingAdapter.cpp
-		src/vamp-hostsdk/PluginChannelAdapter.cpp
-		src/vamp-hostsdk/PluginInputDomainAdapter.cpp
-		src/vamp-hostsdk/PluginLoader.cpp
-		src/vamp-hostsdk/PluginWrapper.cpp
-		src/vamp-hostsdk/RealTime.cpp
-	'''
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.']
-	obj.name         = 'libvamphost'
-	obj.target       = 'vamphost'
-	obj.uselib       = 'FFTW3 FFTW3F'
-	obj.vnum         = LIBVAMP_LIB_VERSION
-	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	
-	# Plugin Library
-	obj = bld.new_task_gen('cxx', 'shlib')
-	obj.source = '''
-		src/vamp-sdk/PluginAdapter.cpp
-		src/vamp-sdk/RealTime.cpp
-	'''
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.']
-	obj.name         = 'libvampplugin'
-	obj.target       = 'vampplugin'
-	obj.uselib       = 'FFTW3 FFTW3F'
-	obj.vnum         = LIBVAMP_LIB_VERSION
-	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	
-def shutdown():
-	autowaf.shutdown()
+    # Host Library
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = '''
+            src/vamp-hostsdk/PluginHostAdapter.cpp
+            src/vamp-hostsdk/PluginBufferingAdapter.cpp
+            src/vamp-hostsdk/PluginChannelAdapter.cpp
+            src/vamp-hostsdk/PluginInputDomainAdapter.cpp
+            src/vamp-hostsdk/PluginLoader.cpp
+            src/vamp-hostsdk/PluginWrapper.cpp
+            src/vamp-hostsdk/RealTime.cpp
+    '''
+    obj.export_includes = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libvamphost'
+    obj.target       = 'vamphost'
+    obj.uselib       = 'FFTW3 FFTW3F'
+    obj.vnum         = LIBVAMP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
+    # Plugin Library
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = '''
+            src/vamp-sdk/PluginAdapter.cpp
+            src/vamp-sdk/RealTime.cpp
+    '''
+    obj.export_includes = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libvampplugin'
+    obj.target       = 'vampplugin'
+    obj.uselib       = 'FFTW3 FFTW3F'
+    obj.vnum         = LIBVAMP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
+def shutdown():
+    autowaf.shutdown()