kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

==SCons==

Browse Source 
* link against debug library of python on win32
This commit is contained in:
Nathan Letwory 2006-11-24 06:08:05 +00:00
parent 9f5713df2f
commit 48b07b4822
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -358,12 +358,15 @@ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, t
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
'${LCGDIR}/png/lib/libpng.dll', '${LCGDIR}/png/lib/libpng.dll',
'${LCGDIR}/python/lib/python24.dll',
'#release/windows/extra/python24.zip', '#release/windows/extra/python24.zip',
'#release/windows/extra/zlib.pyd', '#release/windows/extra/zlib.pyd',
'${LCGDIR}/sdl/lib/SDL.dll', '${LCGDIR}/sdl/lib/SDL.dll',
'${LCGDIR}/zlib/lib/zlib.dll', '${LCGDIR}/zlib/lib/zlib.dll',
'${LCGDIR}/tiff/lib/libtiff.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': if env['OURPLATFORM'] == 'win32-mingw':
dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll'] dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
else: else:

6
tools/Blender.py
View File

@ -137,11 +137,15 @@ def setup_staticlibs(lenv):
def setup_syslibs(lenv): def setup_syslibs(lenv):
syslibs = [ syslibs = [
lenv['BF_PYTHON_LIB'],
lenv['BF_JPEG_LIB'], lenv['BF_JPEG_LIB'],
lenv['BF_PNG_LIB'], lenv['BF_PNG_LIB'],
lenv['BF_ZLIB_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']: if lenv['WITH_BF_INTERNATIONAL']:
syslibs += Split(lenv['BF_FREETYPE_LIB']) syslibs += Split(lenv['BF_FREETYPE_LIB'])
syslibs += Split(lenv['BF_GETTEXT_LIB']) syslibs += Split(lenv['BF_GETTEXT_LIB'])