[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33244] trunk/blender: fix for building with mingw/cmake

Campbell Barton ideasman42 at gmail.com
Tue Nov 23 00:25:21 CET 2010


Revision: 33244
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33244
Author:   campbellbarton
Date:     2010-11-23 00:25:21 +0100 (Tue, 23 Nov 2010)

Log Message:
-----------
fix for building with mingw/cmake

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

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt	2010-11-22 23:06:57 UTC (rev 33243)
+++ trunk/blender/intern/ghost/CMakeLists.txt	2010-11-22 23:25:21 UTC (rev 33244)
@@ -83,9 +83,10 @@
 ELSEIF(WIN32)
 	IF(MSVC)
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-		LIST(APPEND INC ${WINTAB_INC})
 	ENDIF(MSVC)
 
+	LIST(APPEND INC ${WINTAB_INC})
+
 	LIST(APPEND SRC
 		./intern/GHOST_DisplayManagerWin32.cpp
 		./intern/GHOST_SystemWin32.cpp

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-11-22 23:06:57 UTC (rev 33243)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-11-22 23:25:21 UTC (rev 33244)
@@ -303,6 +303,8 @@
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND if not exist \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\" mkdir \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\"
+					COMMAND if \"$(ConfigurationName)\" == \"\" copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
+					COMMAND if \"$(ConfigurationName)\" == \"\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
 					COMMAND if \"$(ConfigurationName)\" == \"Debug\" copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
 					COMMAND if \"$(ConfigurationName)\" == \"Debug\" xcopy /E /Y \"${LIBDIR}\\release\\python31_d\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
 					COMMAND if \"$(ConfigurationName)\" == \"RelWithDebInfo\" copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"





More information about the Bf-blender-cvs mailing list