diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-25 14:56:01 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-25 14:56:01 +0400 |
| commit | 4c8d32b4bf624bd70a4c2b20a9c971ae92e8f8a3 (patch) | |
| tree | dbab30e26f06fbc6a61b4c87a7461582e71180ae /tools | |
| parent | 2d38d0d1e1cf8a2a62639eeb3fcbd81de6e69080 (diff) | |
== SCons ==
* Add sndfile support (False by default).
Note: for this to work, make sure that FFMPEG-support is disabled.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 4 | ||||
| -rwxr-xr-x | tools/btools.py | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 789a6981558..421a79454df 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -130,6 +130,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_FFMPEG_LIBPATH']) if lenv['WITH_BF_JACK']: libincs += Split(lenv['BF_JACK_LIBPATH']) + if lenv['WITH_BF_SNDFILE']: + libincs += Split(lenv['BF_SNDFILE_LIBPATH']) if lenv['WITH_BF_OPENEXR']: libincs += Split(lenv['BF_OPENEXR_LIBPATH']) if lenv['WITH_BF_STATICOPENEXR']: @@ -191,6 +193,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_OGG_LIB']) if lenv['WITH_BF_JACK']: syslibs += Split(lenv['BF_JACK_LIB']) + if lenv['WITH_BF_SNDFILE']: + syslibs += Split(lenv['BF_SNDFILE_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 3e80ac453ce..1ae952adbc7 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -32,6 +32,7 @@ def validate_arguments(args, bc): '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', + 'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_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', @@ -171,13 +172,13 @@ def read_opts(cfg, args): (BoolVariable('WITH_BF_SDL', 'Use SDL if true', False)), ('BF_SDL', 'SDL base path', ''), - ('BF_SDL_INC', 'SDL include path', ''), #$(shell $(BF_SDL)/bin/sdl-config --cflags) - ('BF_SDL_LIB', 'SDL library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer + ('BF_SDL_INC', 'SDL include path', ''), + ('BF_SDL_LIB', 'SDL library', ''), ('BF_SDL_LIBPATH', 'SDL library path', ''), ('BF_LIBSAMPLERATE', 'libsamplerate aka SRC base path', ''), - ('BF_LIBSAMPLERATE_INC', 'libsamplerate aka SRC include path', ''), #$(shell $(BF_SDL)/bin/sdl-config --cflags) - ('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer + ('BF_LIBSAMPLERATE_INC', 'libsamplerate aka SRC include path', ''), + ('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''), ('BF_LIBSAMPLERATE_LIBPATH', 'libsamplerate aka SRC library path', ''), (BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)), @@ -186,6 +187,12 @@ def read_opts(cfg, args): ('BF_JACK_LIB', 'jack library', ''), ('BF_JACK_LIBPATH', 'jack library path', ''), + (BoolVariable('WITH_BF_SNDFILE', 'Enable sndfile support if true', True)), + ('BF_SNDFILE', 'sndfile base path', ''), + ('BF_SNDFILE_INC', 'sndfile include path', ''), + ('BF_SNDFILE_LIB', 'sndfile library', ''), + ('BF_SNDFILE_LIBPATH', 'sndfile library path', ''), + ('BF_PTHREADS', 'Pthreads base path', ''), ('BF_PTHREADS_INC', 'Pthreads include path', ''), ('BF_PTHREADS_LIB', 'Pthreads library', ''), |