* 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
This commit is contained in:
Nathan Letwory
2006-02-05 12:24:52 +00:00
parent c5a0e79fb0
commit 631a8d85d4
8 changed files with 21 additions and 19 deletions

View File

@@ -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':