--- a/SConstruct +++ b/SConstruct @@ -503,6 +503,12 @@ else: env['AUBIO'] = 0 +libraries['vamp'] = LibraryInfo () +libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk') + +libraries['vamphost'] = LibraryInfo () +libraries['vamphost'].ParseConfig('pkg-config --cflags --libs vamp-hostsdk') + env = conf.Finish () if env['FFT_ANALYSIS']: @@ -868,13 +874,6 @@ # these are part of the Ardour source tree because they are C++ # -libraries['vamp'] = LibraryInfo (LIBS='vampsdk', - LIBPATH='#libs/vamp-sdk', - CPPPATH='#libs/vamp-sdk') -libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk', - LIBPATH='#libs/vamp-sdk', - CPPPATH='#libs/vamp-sdk') - env['RUBBERBAND'] = False conf = Configure (env) @@ -1093,7 +1092,6 @@ 'libs/pbd', 'libs/midi++2', 'libs/ardour', - 'libs/vamp-sdk', 'libs/vamp-plugins/', # these are unconditionally included but have # tests internally to avoid compilation etc @@ -1159,7 +1157,6 @@ 'libs/pbd', 'libs/midi++2', 'libs/ardour', - 'libs/vamp-sdk', 'libs/vamp-plugins/', # these are unconditionally included but have # tests internally to avoid compilation etc