diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 15:24:52 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 15:24:52 +0300 |
| commit | 631a8d85d4a2b83394bbbb2ac629bbe2f206fa21 (patch) | |
| tree | eb271d391d0e630c0fc093eb6b5f0d1f279846e8 /tools/Blender.py | |
| parent | c5a0e79fb02d42cdd657ddc6bb0805335df212bd (diff) | |
* WITH_BF_GETTEXT and WITH_BF_FREETYPE are merged into WITH_BF_INTERNATIONAL
* typo in adding BF_OPENAL_LIBPATH, resulting in it not being added at all
Diffstat (limited to 'tools/Blender.py')
| -rw-r--r-- | tools/Blender.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index bdaf3936ee4..a2bc4032f08 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -114,16 +114,16 @@ def setup_staticlibs(lenv): lenv['BF_JPEG_LIBPATH'], lenv['BF_TIFF_LIBPATH'], lenv['BF_PNG_LIBPATH'], - lenv['BF_GETTEXT_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], - lenv['BF_FREETYPE_LIBPATH'], -# lenv['BF_QUICKTIME_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_INTERNATIONAL']: + libincs += Split(lenv['BF_GETTEXT_LIBPATH']) + libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_OPENAL']: - lenv['BF_OPENAL_LIBPATH'] + libincs += Split(lenv['BF_OPENAL_LIBPATH']) return statlibs, libincs @@ -132,10 +132,11 @@ def setup_syslibs(lenv): lenv['BF_PYTHON_LIB'], lenv['BF_JPEG_LIB'], lenv['BF_PNG_LIB'], - lenv['BF_ZLIB_LIB'], - lenv['BF_FREETYPE_LIB'], - lenv['BF_GETTEXT_LIB'] + lenv['BF_ZLIB_LIB'] ] + if lenv['WITH_BF_INTERNATIONAL']: + syslibs += Split(lenv['BF_FREETYPE_LIB']) + syslibs += Split(lenv['BF_GETTEXT_LIB']) if lenv['WITH_BF_OPENAL']: syslibs += Split(lenv['BF_OPENAL_LIB']) if lenv['OURPLATFORM']=='win32vc': |