forked from bartvdbraak/blender
=== SCons ===
Copy the Python 2.5 dll on windows, not 2.4. Also commented out the copying of the python24.zip and zlib.pyd. I'm under the impression there is a concensus we want users to install py25 if they want to use it.
This commit is contained in:
parent
d53570e44c
commit
3aaea833b9
@ -563,15 +563,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',
|
||||
'#release/windows/extra/python24.zip',
|
||||
'#release/windows/extra/zlib.pyd',
|
||||
# '#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')
|
||||
dllsources.append('${LCGDIR}/python/lib/python25_d.dll')
|
||||
else:
|
||||
dllsources.append('${LCGDIR}/python/lib/python24.dll')
|
||||
dllsources.append('${LCGDIR}/python/lib/python25.dll')
|
||||
if env['OURPLATFORM'] == 'win32-mingw':
|
||||
dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user