[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10719] trunk/blender:

[Chris Want]

Revision: 10719
          https://svn.blender.org//revision/?rev=10719&view=rev
Author:   hos
Date:     2007-05-15 23:24:19 +0200 (Tue, 15 May 2007)

Log Message:
-----------

Test commit: Changes to CMake for Python 2.5 under windows 
from Eugene.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2007-05-15 12:53:44 UTC (rev 10718)
+++ trunk/blender/CMakeLists.txt	2007-05-15 21:24:19 UTC (rev 10719)
@@ -196,10 +196,10 @@
   SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
   SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 2.4)
+  SET(PYTHON_VERSION 2.5)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
   SET(PYTHON_BINARY python)
-  SET(PYTHON_LIB python24)
+  SET(PYTHON_LIB python25)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   #SET(WITH_OPENAL ON)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2007-05-15 12:53:44 UTC (rev 10718)
+++ trunk/blender/source/creator/CMakeLists.txt	2007-05-15 21:24:19 UTC (rev 10719)
@@ -149,9 +149,9 @@
     COMMAND copy /Y \"${WIN_LIBDIR}\\sdl\\lib\\SDL.dll\" \"$\(TargetDir\)\\\"
     COMMAND copy /Y \"${WIN_LIBDIR}\\zlib\\lib\\zlib.dll\" \"$\(TargetDir\)\\\"
     COMMAND copy /Y \"${WIN_LIBDIR}\\tiff\\lib\\libtiff.dll\" \"$\(TargetDir\)\\\"
-    COMMAND if $\(ConfigurationName\)==Debug copy /Y \"${WIN_LIBDIR}\\python\\lib\\python24_D.dll\" \"$\(TargetDir\)\\\"
+    COMMAND if $\(ConfigurationName\)==Debug copy /Y \"${WIN_LIBDIR}\\python\\lib\\python25_D.dll\" \"$\(TargetDir\)\\\"
     COMMAND if $\(ConfigurationName\)==Debug copy /Y \"${WIN_LIBDIR}\\CRTL\\lib\\msvcrtd.dll\" \"$\(TargetDir\)\\\"
-    COMMAND if NOT $\(ConfigurationName\)==Debug copy /Y \"${WIN_LIBDIR}\\python\\lib\\python24.dll\" \"$\(TargetDir\)\\\"
+    COMMAND if NOT $\(ConfigurationName\)==Debug copy /Y \"${WIN_LIBDIR}\\python\\lib\\python25.dll\" \"$\(TargetDir\)\\\"
     COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"$\(TargetDir\)\\\"
   )