forked from bartvdbraak/blender
Tweaks for ICONV stuff in scons.
Kent
This commit is contained in:
parent
ba0d87474c
commit
14b6fd1209
@ -368,6 +368,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
|
|||||||
dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
|
dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
|
||||||
else:
|
else:
|
||||||
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
|
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)
|
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
|
||||||
allinstall += windlls
|
allinstall += windlls
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ def setup_syslibs(lenv):
|
|||||||
syslibs += Split(lenv['BF_GETTEXT_LIB'])
|
syslibs += Split(lenv['BF_GETTEXT_LIB'])
|
||||||
if lenv['WITH_BF_OPENAL']:
|
if lenv['WITH_BF_OPENAL']:
|
||||||
syslibs += Split(lenv['BF_OPENAL_LIB'])
|
syslibs += Split(lenv['BF_OPENAL_LIB'])
|
||||||
if lenv['OURPLATFORM']=='win32vc':
|
if lenv['WITH_BF_ICONV']:
|
||||||
syslibs += Split(lenv['BF_ICONV_LIB'])
|
syslibs += Split(lenv['BF_ICONV_LIB'])
|
||||||
if lenv['WITH_BF_OPENEXR']:
|
if lenv['WITH_BF_OPENEXR']:
|
||||||
syslibs += Split(lenv['BF_OPENEXR_LIB'])
|
syslibs += Split(lenv['BF_OPENEXR_LIB'])
|
||||||
|
Loading…
Reference in New Issue
Block a user