diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-10 14:40:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-10 14:40:42 +0000 |
| commit | aa45017cdca5d2429f503c660dad41f486a4fa05 (patch) | |
| tree | caea20362b23d3c82b99075d367873d8e1db7ea2 /SConstruct | |
| parent | ea98e56b1ce5341875bea765e7d72cf50a5203ce (diff) | |
finish merge of vamp-sdk into source tree; write OSC URL to file in ~/.ardour2 ; change stretch button name; fix bad handling of cancel-in-progress during stretch/pitch operation
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2870 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/SConstruct b/SConstruct index eab259fd41..58e498d905 100644 --- a/SConstruct +++ b/SConstruct @@ -767,34 +767,14 @@ def prep_libcheck(topenv, libinfo): prep_libcheck(env, env) -# -# check for VAMP and rubberband (currently optional) -# - -libraries['vamp'] = LibraryInfo() - -env['RUBBERBAND'] = False - -conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) - -if conf.CheckPKGExists('vamp-sdk'): - have_vamp = True - libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk') -else: - have_vamp = False - -libraries['vamp'] = conf.Finish () - -if have_vamp: - if os.path.exists ('libs/rubberband/src'): - conf = Configure (libraries['vamp']) - if conf.CheckHeader ('fftw3.h'): - env['RUBBERBAND'] = True - libraries['rubberband'] = LibraryInfo (LIBS='rubberband', - LIBPATH='#libs/rubberband', - CPPPATH='#libs/rubberband', - CCFLAGS='-DUSE_RUBBERBAND') - libraries['vamp'] = conf.Finish () +env['RUBBERBAND'] = True +libraries['rubberband'] = LibraryInfo (LIBS='rubberband', + LIBPATH='#libs/rubberband', + CPPPATH='#libs/rubberband', + CCFLAGS='-DUSE_RUBBERBAND') +libraries['vamp'] = LibraryInfo (LIBS='vampsdk', + LIBPATH='#libs/vamp-sdk', + CPPPATH='#libs/vamp-sdk/vamp') # # Check for libusb @@ -981,6 +961,7 @@ if env['SYSLIBS']: 'libs/pbd', 'libs/midi++2', 'libs/ardour', + 'libs/vamp-sdk', # these are unconditionally included but have # tests internally to avoid compilation etc # if VST is not set @@ -1045,6 +1026,7 @@ else: 'libs/pbd', 'libs/midi++2', 'libs/ardour', + 'libs/vamp-sdk', # these are unconditionally included but have # tests internally to avoid compilation etc # if VST is not set @@ -1107,9 +1089,8 @@ else: # timefx_subdirs = ['libs/soundtouch'] -if env['RUBBERBAND']: - timefx_subdirs += ['libs/rubberband'] - +timefx_subdirs += ['libs/rubberband'] + opts.Save('scache.conf', env) Help(opts.GenerateHelpText(env)) |