From 48b07b4822ef96e2389ab4369a1c180471230369 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Fri, 24 Nov 2006 06:08:05 +0000 Subject: [PATCH] ==SCons== * link against debug library of python on win32 --- SConstruct | 5 ++++- tools/Blender.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index f674e0e0bd7..813942c29e5 100644 --- a/SConstruct +++ b/SConstruct @@ -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: diff --git a/tools/Blender.py b/tools/Blender.py index 104f258fddc..a578139bdb8 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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'])