diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-27 04:32:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-27 04:32:25 +0000 |
| commit | 263520b70bcbd378da86c89c12edf7e1390d5ded (patch) | |
| tree | 22470fdcc2373ab0899cf859eb3effb432013a8b /SConstruct | |
| parent | 1268bf8b45d2f7c4dad55f055b4f76d4b66c5dd3 (diff) | |
MESCLUN: new SAE-specific bindings file; parametized binding files; fix handling of master source info loading from XML; change rubberband stretch progress reporting; better handling of top level menubar accelerators on Quartz; fixup handling of user-specified bindings file; no more audition on double-click in region list (does rename instead); various OS X specific fixups; partial fix for memory leakage in import code (fixed by timbyr in trunk but not back-portable to 2.X)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2716 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 67cdc5e759..1336c53b08 100644 --- a/SConstruct +++ b/SConstruct @@ -30,6 +30,7 @@ opts.AddOptions( BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0), + BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), @@ -437,8 +438,9 @@ def CheckPKGVersion(context, name, version): def CheckPKGExists(context, name): context.Message ('Checking for %s...' % name) - ret = context.TryAction('pkg-config --exists %s' % name)[0] - context.Result (ret) + ret = context.TryAction('pkg-config --exists %s' % name) + print ("Result was [%s]" % ret[1]) + context.Result (ret[0]) return ret conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, @@ -758,6 +760,8 @@ if conf.CheckPKGExists('vamp-sdk'): else: have_vamp = False +print "---> WE HAVE VAMP: ", have_vamp + libraries['vamp'] = conf.Finish () if have_vamp: @@ -767,7 +771,7 @@ if have_vamp: env['RUBBERBAND'] = True libraries['rubberband'] = LibraryInfo (LIBS='rubberband', LIBPATH='#libs/rubberband', - CPPPATH='#libs/rubberband/rubberband', + CPPPATH='#libs/rubberband', CCFLAGS='-DUSE_RUBBERBAND') libraries['vamp'] = conf.Finish () |