diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-17 05:16:50 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-17 05:16:50 +0400 |
| commit | 1e0fd0d4c14824e856424000e1122dcb1c8b44dd (patch) | |
| tree | caf6363bdf5c4463dbf9bf4c6d8bbcb0dc352094 /tools | |
| parent | 951895b6197925b1dd9f7be884539f809e82f994 (diff) | |
== SCons ==
* add jack support for audio system.
Note that for OSX jack support is still off by default, since
I'm not sure about what goes where. OSX maintainers, please check and fix.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 4 | ||||
| -rwxr-xr-x | tools/btools.py | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index bca9ba4754d..db888c38935 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -128,6 +128,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_SDL_LIBPATH']) if lenv['WITH_BF_FFMPEG']: libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + if lenv['WITH_BF_JACK']: + libincs += Split(lenv['BF_JACK_LIBPATH']) if lenv['WITH_BF_OPENEXR']: libincs += Split(lenv['BF_OPENEXR_LIBPATH']) if lenv['WITH_BF_STATICOPENEXR']: @@ -187,6 +189,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_FFMPEG_LIB']) if lenv['WITH_BF_OGG']: syslibs += Split(lenv['BF_OGG_LIB']) + if lenv['WITH_BF_JACK']: + syslibs += Split(lenv['BF_JACK_LIB']) if lenv['WITH_BF_FFTW3']: syslibs += Split(lenv['BF_FFTW3_LIB']) if lenv['WITH_BF_SDL']: diff --git a/tools/btools.py b/tools/btools.py index 543c503376e..0314aba25b5 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -31,6 +31,7 @@ def validate_arguments(args, bc): 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH', + 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', 'WITH_BF_DDS', @@ -179,6 +180,12 @@ def read_opts(cfg, args): ('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer ('BF_LIBSAMPLERATE_LIBPATH', 'libsamplerate aka SRC library path', ''), + (BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)), + ('BF_JACK', 'jack base path', ''), + ('BF_JACK_INC', 'jack include path', ''), + ('BF_JACK_LIB', 'jack library', ''), + ('BF_JACK_LIBPATH', 'jack library path', ''), + ('BF_PTHREADS', 'Pthreads base path', ''), ('BF_PTHREADS_INC', 'Pthreads include path', ''), ('BF_PTHREADS_LIB', 'Pthreads library', ''), |