diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 20:29:22 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 20:29:22 +0300 |
| commit | 9b36ffca12dfbca619ea61a012b9a6de19275a5f (patch) | |
| tree | 3aad2cf6f7fd594d2d93931888c1ba0468ae360f /tools | |
| parent | 04d44ee31189600e56575472ca31dd71fcc8ab66 (diff) | |
* add proper WITH_BF_TIFF checks
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index a2bc4032f08..b698dcc19a4 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -81,8 +81,6 @@ def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100) print "Wrong type combinations for libtype and priority. Only str and int or list and list" Exit() -#libs = init_lib_dict(libs) - def create_blender_liblist(lenv = None, libtype = None): if not lenv or not libtype: print "missing arg" @@ -96,7 +94,6 @@ def create_blender_liblist(lenv = None, libtype = None): curlib = libs[libtype] for sk in sortlist: v = curlib[sk] - #for k,v in sorted(libs[libtype].iteritems()): lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) return lst @@ -112,13 +109,14 @@ def setup_staticlibs(lenv): lenv['BF_OPENGL_LIBPATH'], lenv['BF_SDL_LIBPATH'], lenv['BF_JPEG_LIBPATH'], - lenv['BF_TIFF_LIBPATH'], lenv['BF_PNG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] 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']) @@ -140,8 +138,9 @@ def setup_syslibs(lenv): if lenv['WITH_BF_OPENAL']: syslibs += Split(lenv['BF_OPENAL_LIB']) if lenv['OURPLATFORM']=='win32vc': - syslibs += Split(lenv['BF_ICONV_LIB']) - syslibs += Split(lenv['BF_TIFF_LIB']) + 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']) |