From c5a33b59182f115072745e1201899fd09ccfd1aa Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 26 Apr 2008 16:06:08 +1000 Subject: [PATCH] Use system versions of the vamp and rubberband libraries when SYSLIBS=1 --- SConstruct | 68 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/SConstruct b/SConstruct index 782a0b6..6c04ffb 100644 --- a/SConstruct +++ b/SConstruct @@ -807,24 +807,6 @@ def prep_libcheck(topenv, libinfo): prep_libcheck(env, env) - -# -# 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') - -if env['RUBBERBAND']: - libraries['rubberband'] = LibraryInfo (LIBS='rubberband', - LIBPATH='#libs/rubberband', - CPPPATH='#libs/rubberband', - CCFLAGS='-DUSE_RUBBERBAND') - # # Check for libusb @@ -981,7 +963,6 @@ subdirs = [ # tests internally to avoid compilation etc # if COREAUDIO is not set 'libs/appleutility', - 'libs/vamp-sdk', 'libs/vamp-plugins' ] @@ -1000,13 +981,20 @@ libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') +if env['RUBBERBAND']: + env.Append(CCFLAGS="-DUSE_RUBBERBAND") + if env['SYSLIBS']: syslibdeps = \ { 'sigc++-2.0' : '2.0', 'gtkmm-2.4' : '2.8', - 'libgnomecanvasmm-2.6' : '2.12.0' + 'libgnomecanvasmm-2.6' : '2.12.0', + 'libSoundTouch' : '1.2.1', + 'vamp-sdk' : '1.1', + 'vamp-hostsdk' : '1.1', + 'rubberband' : '1.0' } conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, @@ -1036,11 +1024,16 @@ if env['SYSLIBS']: libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4') libraries['libgnomecanvasmm'] = LibraryInfo() libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') - libraries['soundtouch'] = LibraryInfo() - #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') - # Comment the previous line and uncomment this for Debian: libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + libraries['vamp'] = LibraryInfo() + libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') + libraries['vamphost'] = LibraryInfo() + libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk') + + if env['RUBBERBAND']: + libraries['rubberband'] = LibraryInfo() + libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband') else: libraries['sigc2'] = LibraryInfo(LIBS='sigc++2', @@ -1069,8 +1062,25 @@ else: LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) + 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') + + if env['RUBBERBAND']: + libraries['rubberband'] = LibraryInfo (LIBS='rubberband', + LIBPATH='#libs/rubberband', + CPPPATH='#libs/rubberband') + subdirs += ['libs/rubberband'] + + subdirs += [ 'libs/sigc++2', + 'libs/soundtouch', + 'libs/vamp-sdk' ] gtk_subdirs += [ @@ -1079,7 +1089,7 @@ else: 'libs/gtkmm2/atk', 'libs/gtkmm2/gdk', 'libs/gtkmm2/gtk', - 'libs/libgnomecanvasmm', + 'libs/libgnomecanvasmm' ] # @@ -1115,14 +1125,6 @@ else: env['POWERMATE'] = 0 env['TRANZPORT'] = 0 -# -# timestretch libraries -# - -timefx_subdirs = ['libs/soundtouch'] -if env['RUBBERBAND']: - timefx_subdirs += ['libs/rubberband'] - opts.Save('scache.conf', env) Help(opts.GenerateHelpText(env)) @@ -1281,7 +1283,7 @@ env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) for subdir in coredirs: SConscript (subdir + '/SConscript') -for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]: +for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: for subdir in sublistdir: SConscript (subdir + '/SConscript') -- 1.5.4.1