X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-sdk%2Fwscript;h=f1b5a3fa9270b4384d63009df8373d82c65c05c1;hb=a5ab2e99e19d5f5d4c1f91f38cd774fefdf257dc;hp=ebb1d71e4a6f76f02ed7b4f00a1127166b42a4c6;hpb=593ffe80331f9cca68664f9dd501ce95b545f0c8;p=ardour.git

diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript
index ebb1d71e4a..f1b5a3fa92 100644
--- a/libs/vamp-sdk/wscript
+++ b/libs/vamp-sdk/wscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import autowaf
+import os
 
 # Version of this package (even if built as a child)
 LIBVAMP_VERSION = '0.0.0'
@@ -23,7 +24,7 @@ def set_options(opt):
 
 def configure(conf):
 	autowaf.configure(conf)
-	autowaf.check_tool(conf, 'compiler_cxx')
+	conf.check_tool('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')
@@ -32,13 +33,13 @@ def build(bld):
 	# Host Library
 	obj = bld.new_task_gen('cxx', 'shlib')
 	obj.source = '''
-		vamp-sdk/PluginHostAdapter.cpp
-		vamp-sdk/hostext/PluginBufferingAdapter.cpp
-		vamp-sdk/hostext/PluginChannelAdapter.cpp
-		vamp-sdk/hostext/PluginInputDomainAdapter.cpp
-		vamp-sdk/hostext/PluginLoader.cpp
-		vamp-sdk/hostext/PluginWrapper.cpp
-		vamp-sdk/RealTime.cpp
+		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     = ['.']
@@ -46,13 +47,13 @@ def build(bld):
 	obj.target       = 'vamphost'
 	obj.uselib       = 'FFTW3 FFTW3F'
 	obj.vnum         = LIBVAMP_LIB_VERSION
-	obj.install_path = ''
-	
+	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
 	# Plugin Library
 	obj = bld.new_task_gen('cxx', 'shlib')
 	obj.source = '''
-		vamp-sdk/PluginAdapter.cpp
-		vamp-sdk/RealTime.cpp
+		src/vamp-sdk/PluginAdapter.cpp
+		src/vamp-sdk/RealTime.cpp
 	'''
 	obj.export_incdirs = ['.']
 	obj.includes     = ['.']
@@ -60,8 +61,8 @@ def build(bld):
 	obj.target       = 'vampplugin'
 	obj.uselib       = 'FFTW3 FFTW3F'
 	obj.vnum         = LIBVAMP_LIB_VERSION
-	obj.install_path = ''
-	
+	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
 def shutdown():
 	autowaf.shutdown()