==SCons==
authorNathan Letwory <nathan@letworyinteractive.com>
Fri, 24 Nov 2006 06:08:05 +0000 (06:08 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Fri, 24 Nov 2006 06:08:05 +0000 (06:08 +0000)
* link against debug library of python on win32

SConstruct
tools/Blender.py

index f674e0e0bd70ecc18803c7c3dd53adcfd3b6518a..813942c29e5eb8e157ba9a96ef72a64712826340 100644 (file)
@@ -358,12 +358,15 @@ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, t
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
     dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
                         '${LCGDIR}/png/lib/libpng.dll',
-                        '${LCGDIR}/python/lib/python24.dll',
                         '#release/windows/extra/python24.zip',
                         '#release/windows/extra/zlib.pyd',
                         '${LCGDIR}/sdl/lib/SDL.dll',
                         '${LCGDIR}/zlib/lib/zlib.dll',
                         '${LCGDIR}/tiff/lib/libtiff.dll']
+    if env['BF_DEBUG']:
+        dllsources.append('${LCGDIR}/python/lib/python24_d.dll')
+    else:
+        dllsources.append('${LCGDIR}/python/lib/python24.dll')
     if env['OURPLATFORM'] == 'win32-mingw':
         dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
     else:
index 104f258fddc2032e59f773e9a4adea2ab825bbec..a578139bdb867414afcb6a6c20362509018353f9 100644 (file)
@@ -137,11 +137,15 @@ def setup_staticlibs(lenv):
 
 def setup_syslibs(lenv):
     syslibs = [
-        lenv['BF_PYTHON_LIB'],
+        
         lenv['BF_JPEG_LIB'],
         lenv['BF_PNG_LIB'],
         lenv['BF_ZLIB_LIB']
         ]
+    if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
+        syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
+    else:
+        syslibs.append(lenv['BF_PYTHON_LIB'])
     if lenv['WITH_BF_INTERNATIONAL']:
         syslibs += Split(lenv['BF_FREETYPE_LIB'])
         syslibs += Split(lenv['BF_GETTEXT_LIB'])