diff options
author | David Robillard <d@drobilla.net> | 2008-01-12 23:45:50 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-01-12 23:45:50 +0000 |
commit | e92c1669c1cdf857b8a3900abb9f891e6ca9fdad (patch) | |
tree | f02725efdfd3473527cb7fa94471a7cff2528880 /SConstruct | |
parent | bf256c168170de1b9e1411bb563c571d67470c05 (diff) |
Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions.
git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/SConstruct b/SConstruct index 8a7364b7c1..651a6a3eab 100644 --- a/SConstruct +++ b/SConstruct @@ -231,6 +231,7 @@ def i18n (buildenv, sources, installenv): buildenv.PoBuild(po_file, ['po/'+po_file, potfile]) mo_file = po_file.replace (".po", ".mo") installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file)) + installenv.Alias ('msgupdate', buildenv.MoBuild (mo_file, po_file)) for lang in languages: modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/')) @@ -363,7 +364,7 @@ def distcopy (target, source, env): return p.close () def tarballer (target, source, env): - cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" + cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" + " --exclude .svn --exclude '.svn/*'" print 'running ', cmd, ' ... ' p = os.popen (cmd) return p.close () @@ -766,34 +767,32 @@ def prep_libcheck(topenv, libinfo): prep_libcheck(env, env) -# -# check for VAMP and rubberband (currently optional) -# -libraries['vamp'] = LibraryInfo() +libraries['vamp'] = LibraryInfo (LIBS='vampsdk', + LIBPATH='#libs/vamp-sdk', + CPPPATH='#libs/vamp-sdk/vamp') env['RUBBERBAND'] = False -#conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) +#conf = Configure (env) # -#if conf.CheckPKGExists('vamp-sdk'): -# have_vamp = True -# libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk') +#if conf.CheckHeader ('fftw3.h'): +# env['RUBBERBAND'] = True +# libraries['rubberband'] = LibraryInfo (LIBS='rubberband', +# LIBPATH='#libs/rubberband', +# CPPPATH='#libs/rubberband', +# CCFLAGS='-DUSE_RUBBERBAND') #else: -# have_vamp = False -# -#libraries['vamp'] = conf.Finish () +# print "" +# print "-------------------------------------------------------------------------" +# print "You do not have the FFTW single-precision development package installed." +# print "This prevents Ardour from using the Rubberband library for timestretching" +# print "and pitchshifting. It will fall back on SoundTouch for timestretch, and " +# print "pitchshifting will not be available." +# print "-------------------------------------------------------------------------" +# print "" # -#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 () +#conf.Finish() # # Check for libusb @@ -995,6 +994,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 @@ -1068,6 +1068,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 @@ -1132,7 +1133,7 @@ else: timefx_subdirs = ['libs/soundtouch'] #if env['RUBBERBAND']: # timefx_subdirs += ['libs/rubberband'] - + opts.Save('scache.conf', env) Help(opts.GenerateHelpText(env)) |