Tweaks for ICONV stuff in scons.

Kent
This commit is contained in:
Kent Mein 2006-11-10 17:59:40 +00:00
parent ba0d87474c
commit 14b6fd1209
2 changed files with 3 additions and 1 deletions

@ -368,6 +368,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
else:
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
if env['WITH_BF_ICONV']:
dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls

@ -147,7 +147,7 @@ def setup_syslibs(lenv):
syslibs += Split(lenv['BF_GETTEXT_LIB'])
if lenv['WITH_BF_OPENAL']:
syslibs += Split(lenv['BF_OPENAL_LIB'])
if lenv['OURPLATFORM']=='win32vc':
if lenv['WITH_BF_ICONV']:
syslibs += Split(lenv['BF_ICONV_LIB'])
if lenv['WITH_BF_OPENEXR']:
syslibs += Split(lenv['BF_OPENEXR_LIB'])