[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26052] trunk/blender: Fix link libraries for Win32 Cmake debug build.

[Benoit Bolsee]

Revision: 26052
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26052
Author:   ben2610
Date:     2010-01-17 20:19:15 +0100 (Sun, 17 Jan 2010)

Log Message:
-----------
Fix link libraries for Win32 Cmake debug build. Unfortunately, debug builds are still crashing at startup - need to investigate further.

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

Modified: trunk/blender/CMake/macros.cmake
===================================================================
--- trunk/blender/CMake/macros.cmake	2010-01-17 17:36:11 UTC (rev 26051)
+++ trunk/blender/CMake/macros.cmake	2010-01-17 19:19:15 UTC (rev 26052)
@@ -135,15 +135,35 @@
     TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
   ENDIF(WITH_QUICKTIME)
   IF(WITH_OPENEXR)
-    TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+    IF(WIN32)
+      FOREACH(loop_var ${OPENEXR_LIB})
+        TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+        TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+      ENDFOREACH(loop_var)
+    ELSEIF(WIN32)
+      TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+    ENDIF(WIN32)
   ENDIF(WITH_OPENEXR)
   IF(WITH_FFMPEG)
     TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
   ENDIF(WITH_FFMPEG)
   IF(WITH_OPENCOLLADA)
-    TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
-    TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
-    TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+    IF(WIN32)
+      FOREACH(loop_var ${OPENCOLLADA_LIB})
+        TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+        TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+      ENDFOREACH(loop_var)
+      TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
+      TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
+      IF(EXPAT_LIB)
+        TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d)
+        TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
+      ENDIF(EXPAT_LIB)
+    ELSE(WIN32)
+	  TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+      TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+      TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+    ENDIF(WIN32)
   ENDIF(WITH_OPENCOLLADA)
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-01-17 17:36:11 UTC (rev 26051)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-01-17 19:19:15 UTC (rev 26052)
@@ -273,6 +273,7 @@
 			POST_BUILD
 			MAIN_DEPENDENCY blender
 			COMMAND copy /Y \"${WIN_LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\python31_d.zip\"
 			COMMAND copy /Y \"${WIN_LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\"
 			COMMAND copy /Y \"${WIN_LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\"
 			COMMAND copy /Y \"${WIN_LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"