[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35735] trunk/blender: support for blender as a module on win32.

[Campbell Barton]

Revision: 35735
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35735
Author:   campbellbarton
Date:     2011-03-24 00:14:49 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
support for blender as a module on win32.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-03-23 23:07:09 UTC (rev 35734)
+++ trunk/blender/CMakeLists.txt	2011-03-24 00:14:49 UTC (rev 35735)
@@ -1017,6 +1017,13 @@
 endif() 
 
 #-----------------------------------------------------------------------------
+# Configure Python.
+
+if(WITH_PYTHON_MODULE)
+	add_definitions(-DPy_ENABLE_SHARED)
+endif() 
+
+#-----------------------------------------------------------------------------
 # Extra compile flags
 
 if((NOT WIN32) AND (NOT MSVC))

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-03-23 23:07:09 UTC (rev 35734)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-03-24 00:14:49 UTC (rev 35735)
@@ -66,7 +66,7 @@
 
 	link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
 
-	if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
+	if(WITH_PYTHON)  #  AND NOT WITH_PYTHON_MODULE  # WIN32 needs
 		link_directories(${PYTHON_LIBPATH})
 	endif()
 	if(WITH_INTERNATIONAL)
@@ -127,7 +127,7 @@
 	target_link_libraries(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
 
 	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-	if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
+	if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
 		target_link_libraries(${target} ${PYTHON_LINKFLAGS})
 
 		if(WIN32 AND NOT UNIX)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-03-23 23:07:09 UTC (rev 35734)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-03-24 00:14:49 UTC (rev 35735)
@@ -169,7 +169,18 @@
 			 PREFIX ""
 			 OUTPUT_NAME bpy
 			 LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
+			 RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/  # only needed on windows
 	)
+	
+	if(WIN32)
+		# python modules use this
+		set_target_properties(
+			blender
+			PROPERTIES
+				 SUFFIX ".pyd"
+		)	
+	endif()
+	
 else()
 	add_executable(blender ${EXETYPE} ${SRC})
 endif()