Test commit: Changes to CMake for Python 2.5 under windows
authorChris Want <cwant@ualberta.ca>
Tue, 15 May 2007 21:24:19 +0000 (21:24 +0000)
committerChris Want <cwant@ualberta.ca>
Tue, 15 May 2007 21:24:19 +0000 (21:24 +0000)
from Eugene.

CMakeLists.txt
source/creator/CMakeLists.txt

index 121dbd2814ee92ab35d035c2744da4dd51fe52c5..978b3cd339e985cdcf5f4278b3c207052c63ba16 100644 (file)
@@ -196,10 +196,10 @@ IF(WIN32)
   SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
   SET(PYTHON ${LIBDIR}/python)
   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_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)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   #SET(WITH_OPENAL ON)
index 5c52f21a375689af218fa10fb0d8ede8d75b31b0..96f1a47cd99f802e2cca84ae01663e13dc021363 100644 (file)
@@ -149,9 +149,9 @@ IF(WIN32)
     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 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 $\(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\)\\\"
   )
 
     COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"$\(TargetDir\)\\\"
   )