diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | tools/Blender.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 017fed45921..b5fb4d7d4ac 100644 --- a/SConstruct +++ b/SConstruct @@ -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 diff --git a/tools/Blender.py b/tools/Blender.py index 2d76e474263..104f258fddc 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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']) |