Revision: 19732
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19732
Author: shul
Date: 2009-04-15 15:11:08 +0200 (Wed, 15 Apr 2009)
Log Message:
-----------
cmake support for python25_d.lib in debug on win32. other platforms should work
as always
Modified Paths:
--------------
branches/blender2.5/blender/CMake/macros.cmake
Modified: branches/blender2.5/blender/CMake/macros.cmake
===================================================================
--- branches/blender2.5/blender/CMake/macros.cmake 2009-04-15 12:59:49 UTC
(rev 19731)
+++ branches/blender2.5/blender/CMake/macros.cmake 2009-04-15 13:11:08 UTC
(rev 19732)
@@ -60,6 +60,23 @@
target)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}
")
TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB}
${LLIBS})
+
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+
+ # since we are using the local libs for python when compiling msvc projects,
we need to add _d when compiling debug versions
+
+ IF(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+
+ TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+
+ ELSE(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+
+ ENDIF(WIN32)
+
IF(WITH_INTERNATIONAL)
TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
