From 70a72d4133736fc4b56a806f60851396d84ba435 Mon Sep 17 00:00:00 2001 From: Chris Want Date: Tue, 15 May 2007 21:24:19 +0000 Subject: [PATCH] Test commit: Changes to CMake for Python 2.5 under windows from Eugene. --- CMakeLists.txt | 4 ++-- source/creator/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 121dbd2814e..978b3cd339e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,10 +196,10 @@ IF(WIN32) 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) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 5c52f21a375..96f1a47cd99 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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 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\)\\\" )