From 2996f08f845c4b67b0231d5832668da5ddb2d227 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 3 May 2011 18:29:11 +0000
Subject: Cycles: first batch of windows build fixes, not quite there yet.

---
 intern/cycles/blender/CMakeLists.txt | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'intern/cycles/blender/CMakeLists.txt')

diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 096363e5d9f..56d08b61b65 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -29,7 +29,8 @@ INCLUDE_DIRECTORIES(
 	../util
 	../subd
 	${BLENDER_INCLUDE_DIRS}
-	${PYTHON_INCLUDE_DIRS})
+	${PYTHON_INCLUDE_DIRS}
+	${GLEW_INCLUDE_PATH})
 
 SET(LIBRARIES
 	cycles_render
@@ -41,7 +42,6 @@ SET(LIBRARIES
 	${Boost_LIBRARIES}
 	${OPENGL_LIBRARIES}
 	${OPENIMAGEIO_LIBRARY}
-	${PYTHON_LIBRARIES}
 	${GLUT_LIBRARIES}
 	${GLEW_LIBRARIES}
 	${BLENDER_LIBRARIES})
@@ -58,10 +58,21 @@ IF(WITH_CYCLES_OPENCL)
 	LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES})
 ENDIF()
 
+LINK_DIRECTORIES(${PYTHON_LIBPATH})
 SET(CMAKE_MODULE_LINKER_FLAGS ${PYTHON_MODULE_FLAGS})
 
 ADD_LIBRARY(cycles_blender MODULE ${sources} ${headers})
 ADD_DEPENDENCIES(cycles_blender bf_rna)
+
+IF(WIN32)
+	TARGET_LINK_LIBRARIES(cycles_blender ${PYTHON_LINKFLAGS})
+	TARGET_LINK_LIBRARIES(cycles_blender debug ${PYTHON_LIBRARY}_d)
+	TARGET_LINK_LIBRARIES(cycles_blender optimized ${PYTHON_LIBRARY})
+
+	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES PREFIX "lib")
+	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES SUFFIX ".pyd")
+ENDIF()
+
 TARGET_LINK_LIBRARIES(cycles_blender ${LIBRARIES})
 
 INSTALL(FILES ${addonfiles} DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
@@ -71,3 +82,13 @@ IF(UNIX AND NOT APPLE)
 	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
 ENDIF()
 
+# Install DLL's
+
+IF(WIN32)
+	FILE(GLOB OIIO_DLLS "${CYCLES_OIIO}/bin/*.dll")
+	FILE(GLOB BOOST_DLLS "${CYCLES_BOOST}/lib/*.dll")
+	INSTALL(FILES ${OIIO_DLLS} ${BOOST_DLLS}
+		DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
+ENDIF()
+
+
-- 
cgit v1.2.3