Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* add proper WITH_BF_TIFF checks

Browse Source
This commit is contained in:
Nathan Letwory
2006-02-05 17:29:22 +00:00
parent 04d44ee311
commit 9b36ffca12
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/Blender.py
View File

@@ -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" print "Wrong type combinations for libtype and priority. Only str and int or list and list"
Exit() Exit()
#libs = init_lib_dict(libs)
def create_blender_liblist(lenv = None, libtype = None): def create_blender_liblist(lenv = None, libtype = None):
if not lenv or not libtype: if not lenv or not libtype:
print "missing arg" print "missing arg"
@@ -96,7 +94,6 @@ def create_blender_liblist(lenv = None, libtype = None):
curlib = libs[libtype] curlib = libs[libtype]
for sk in sortlist: for sk in sortlist:
v = curlib[sk] v = curlib[sk]
#for k,v in sorted(libs[libtype].iteritems()):
lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
return lst return lst
@@ -112,13 +109,14 @@ def setup_staticlibs(lenv):
lenv['BF_OPENGL_LIBPATH'], lenv['BF_OPENGL_LIBPATH'],
lenv['BF_SDL_LIBPATH'], lenv['BF_SDL_LIBPATH'],
lenv['BF_JPEG_LIBPATH'], lenv['BF_JPEG_LIBPATH'],
lenv['BF_TIFF_LIBPATH'],
lenv['BF_PNG_LIBPATH'], lenv['BF_PNG_LIBPATH'],
lenv['BF_ZLIB_LIBPATH'], lenv['BF_ZLIB_LIBPATH'],
lenv['BF_ICONV_LIBPATH'] lenv['BF_ICONV_LIBPATH']
] ]
libincs += Split(lenv['BF_OPENEXR_LIBPATH']) libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
if lenv['WITH_BF_TIFF']:
libincs += lenv['BF_TIFF_LIBPATH'],
if lenv['WITH_BF_INTERNATIONAL']: if lenv['WITH_BF_INTERNATIONAL']:
libincs += Split(lenv['BF_GETTEXT_LIBPATH']) libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
libincs += Split(lenv['BF_FREETYPE_LIBPATH']) libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
@@ -141,6 +139,7 @@ def setup_syslibs(lenv):
syslibs += Split(lenv['BF_OPENAL_LIB']) syslibs += Split(lenv['BF_OPENAL_LIB'])
if lenv['OURPLATFORM']=='win32vc': if lenv['OURPLATFORM']=='win32vc':
syslibs += Split(lenv['BF_ICONV_LIB']) syslibs += Split(lenv['BF_ICONV_LIB'])
if lenv['WITH_BF_TIFF']:
syslibs += Split(lenv['BF_TIFF_LIB']) syslibs += Split(lenv['BF_TIFF_LIB'])
if lenv['WITH_BF_OPENEXR']: if lenv['WITH_BF_OPENEXR']:
syslibs += Split(lenv['BF_OPENEXR_LIB']) syslibs += Split(lenv['BF_OPENEXR_LIB'])