diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-09-19 05:39:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-09-19 05:39:34 +0400 |
| commit | 15bce017df4477e13eb480060cd86690ed11c2fc (patch) | |
| tree | f3369afa59a8e0bf2e58f7894c7e2d839f9eec4f /tools | |
| parent | 6ff74f45279aeea88fa9a93ba0ced726fdeafc5a (diff) | |
scons update, BF_NO_ELBEEM wasnt working, WITH_BF_SDL wasnt implimented, WITH_CCGSUBSURF isnt used anymore.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 2a63ca5b697..8f565174b0e 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -111,15 +111,16 @@ def setup_staticlibs(lenv): '/usr/lib', lenv['BF_PYTHON_LIBPATH'], lenv['BF_OPENGL_LIBPATH'], - lenv['BF_SDL_LIBPATH'], lenv['BF_JPEG_LIBPATH'], lenv['BF_PNG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] - - - libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + + if lenv['WITH_BF_SDL']: + libincs += Split(lenv['BF_SDL_LIBPATH']) + if lenv['WITH_BF_FFMPEG']: + libincs += Split(lenv['BF_FFMPEG_LIBPATH']) if lenv['WITH_BF_STATICCXX']: statlibs += Split(lenv['BF_CXX_LIB_STATIC']) if lenv['WITH_BF_OPENEXR']: @@ -172,7 +173,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_OPENEXR_LIB']) if lenv['WITH_BF_FFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) - syslibs += Split(lenv['BF_SDL_LIB']) + if lenv['WITH_BF_SDL']: + syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: syslibs += Split(lenv['BF_OPENGL_LIB']) if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'): |