Tweaks for ICONV stuff in scons.
authorKent Mein <mein@cs.umn.edu>
Fri, 10 Nov 2006 17:59:40 +0000 (17:59 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 10 Nov 2006 17:59:40 +0000 (17:59 +0000)
Kent

SConstruct
tools/Blender.py

index 017fed45921d57d7a4c08cb541f62c1f9cb9f7fe..b5fb4d7d4ac773532a605aefa98349197f09a094 100644 (file)
@@ -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
 
index 2d76e47426350574e7dc6da6e40115cdd3c6f68a..104f258fddc2032e59f773e9a4adea2ab825bbec 100644 (file)
@@ -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'])