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 | |
parent | 9b36ffca12dfbca619ea61a012b9a6de19275a5f (diff) |
==SCons==
* remove useless BF_TIFF* options. Upon closer inspection of code, only
path to headers is needed
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | config/darwin-config.py | 3 | ||||
-rw-r--r-- | config/linux2-config.py | 2 | ||||
-rw-r--r-- | config/linuxcross-config.py | 2 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 3 | ||||
-rw-r--r-- | config/win32-vc-config.py | 3 | ||||
-rw-r--r-- | tools/Blender.py | 4 | ||||
-rwxr-xr-x | tools/btools.py | 5 |
8 files changed, 2 insertions, 22 deletions
diff --git a/SConstruct b/SConstruct index 82473f086ad..9f38201d479 100644 --- a/SConstruct +++ b/SConstruct @@ -294,7 +294,7 @@ if sys.platform=='win32': windlls = [] allinstall += windlls -installtarget = env.Alias('install', [allinstall]) +installtarget = env.Alias('install', allinstall) bininstalltarget = env.Alias('install-bin', blenderinstall) if env['WITH_BF_PLAYER']: diff --git a/config/darwin-config.py b/config/darwin-config.py index befa4b69773..307d4d68aaa 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -40,11 +40,8 @@ BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' BF_PNG_LIBPATH = '${BF_PNG}/lib' -WITH_BF_TIFF = 'false' BF_TIFF = LCGDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -BF_TIFF_LIB = 'tiff' -BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = 'true' BF_ZLIB = '/usr' diff --git a/config/linux2-config.py b/config/linux2-config.py index 415fcb9b274..b2ee99ae894 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -33,10 +33,8 @@ BF_PNG = '/usr' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' -WITH_BF_TIFF = 'true' BF_TIFF = '/usr' BF_TIFF_INC = '${BF_TIFF}/include' -BF_TIFF_LIB = 'tiff' WITH_BF_ZLIB = 'true' BF_ZLIB = '/usr' diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 4c7ae813e3c..560c0594659 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -33,10 +33,8 @@ BF_PNG = '/usr' BF_PNG_INC = BF_PNG + '/include' BF_PNG_LIB = 'png' -WITH_BF_TIFF = 'true' BF_TIFF = '/usr' BF_TIFF_INC = BF_TIFF + '/include' -BF_TIFF_LIB = 'tiff' WITH_BF_ZLIB = 'true' BF_ZLIB = '/usr' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 11c4578cf3d..5bed5b7591f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -39,11 +39,8 @@ BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' BF_PNG_LIBPATH = '${BF_PNG}/lib' -WITH_BF_TIFF = 'true' BF_TIFF = LCGDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -BF_TIFF_LIB = 'z tiff' -BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = 'true' BF_ZLIB = LCGDIR + '/zlib' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 320fbc35d27..489d6e8e348 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -45,11 +45,8 @@ BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'libpng' BF_PNG_LIBPATH = '${BF_PNG}/lib' -WITH_BF_TIFF = 'true' BF_TIFF = LCGDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -BF_TIFF_LIB = 'libtiff' -BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = 'true' BF_ZLIB = LCGDIR + '/zlib' 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', ''), |