Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2007-03-01 08:00:24 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2007-03-01 08:00:24 +0300
commit3aaea833b9ed2331e9d1db18cdb4963acd3323dc (patch)
treec88541a0bd0745ba2c8296fec85a5856053f129c /SConstruct
parentd53570e44c07f6d07ff5b70553fb2584a83180a8 (diff)
=== 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.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct8
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index f1948198fba..ce41589a03a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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: