diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
| commit | 6c5c58e05799f2b593cd81fcff57e6ef72ad57fb (patch) | |
| tree | 8add929ef94d03fc69aecce6ef2baf283505782f /tools | |
| parent | c1ca2ab5dceb8d5355215a3c7a80b171f394e487 (diff) | |
2.5: Sound branch merge!
See mailing list for additional information.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 4 | ||||
| -rwxr-xr-x | tools/btools.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index c1503904037..bca9ba4754d 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -117,6 +117,7 @@ def setup_staticlibs(lenv): lenv['BF_JPEG_LIBPATH'], lenv['BF_PNG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], + lenv['BF_LIBSAMPLERATE_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] @@ -157,7 +158,8 @@ def setup_syslibs(lenv): lenv['BF_JPEG_LIB'], lenv['BF_PNG_LIB'], - lenv['BF_ZLIB_LIB'] + lenv['BF_ZLIB_LIB'], + lenv['BF_LIBSAMPLERATE_LIB'] ] syslibs += Split(lenv['BF_FREETYPE_LIB']) diff --git a/tools/btools.py b/tools/btools.py index 0f86d924738..543c503376e 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -30,6 +30,7 @@ def validate_arguments(args, bc): 'WITH_BF_PYTHON', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', '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', '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', @@ -173,6 +174,11 @@ def read_opts(cfg, args): ('BF_SDL_LIB', 'SDL library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer ('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_LIBPATH', 'libsamplerate aka SRC library path', ''), + ('BF_PTHREADS', 'Pthreads base path', ''), ('BF_PTHREADS_INC', 'Pthreads include path', ''), ('BF_PTHREADS_LIB', 'Pthreads library', ''), |