diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 20:50:19 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 20:50:19 +0300 |
| commit | 896b6288ca969f2277618e56a681ca638b7a5b67 (patch) | |
| tree | fa0aa349d4b8ca39770bbfbc9868fe348724b020 /tools | |
| parent | 9b36ffca12dfbca619ea61a012b9a6de19275a5f (diff) | |
==SCons==
* remove useless BF_TIFF* options. Upon closer inspection of code, only
path to headers is needed
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 4 | ||||
| -rwxr-xr-x | tools/btools.py | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index b698dcc19a4..4a631f84798 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -115,8 +115,6 @@ def setup_staticlibs(lenv): ] libincs += Split(lenv['BF_OPENEXR_LIBPATH']) - if lenv['WITH_BF_TIFF']: - libincs += lenv['BF_TIFF_LIBPATH'], if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) libincs += Split(lenv['BF_FREETYPE_LIBPATH']) @@ -139,8 +137,6 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_OPENAL_LIB']) if lenv['OURPLATFORM']=='win32vc': syslibs += Split(lenv['BF_ICONV_LIB']) - if lenv['WITH_BF_TIFF']: - syslibs += Split(lenv['BF_TIFF_LIB']) if lenv['WITH_BF_OPENEXR']: syslibs += Split(lenv['BF_OPENEXR_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) diff --git a/tools/btools.py b/tools/btools.py index 6cceb1d3e22..7c9f7ebb935 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -22,7 +22,7 @@ def validate_arguments(args, bc): 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', - 'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', + 'BF_TIFF', 'BF_TIFF_INC', 'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_INTERNATIONAL', 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'BF_GETTEXT_LIBPATH', @@ -148,11 +148,8 @@ def read_opts(cfg, args): ('BF_PNG_LIB', 'PNG library', ''), ('BF_PNG_LIBPATH', 'PNG library path', ''), - (BoolOption('WITH_BF_TIFF', 'Use TIFF if true', 'true')), ('BF_TIFF', 'TIFF base path', ''), ('BF_TIFF_INC', 'TIFF include path', ''), - ('BF_TIFF_LIB', 'TIFF library', ''), - ('BF_TIFF_LIBPATH', 'TIFF library path', ''), (BoolOption('WITH_BF_ZLIB', 'Use ZLib if true', 'true')), ('BF_ZLIB', 'ZLib base path', ''), |