diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
| commit | 2996f08f845c4b67b0231d5832668da5ddb2d227 (patch) | |
| tree | 419f3dbd78a19398883a405606f7a7de83084d90 /intern/cycles/cmake | |
| parent | 170f8c8c4109afb366bac0f385d9e2f59af6c8e2 (diff) | |
Cycles: first batch of windows build fixes, not quite there yet.
Diffstat (limited to 'intern/cycles/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 9 | ||||
| -rw-r--r-- | intern/cycles/cmake/platforms.cmake | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 5d1ed868574..cfd997a6469 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -8,9 +8,6 @@ SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" "1.41" "1.41.0" "1.40" "1.40.0" "1.39" "1.39.0" "1.38" "1.38.0" "1.37" "1.37.0" "1.34.1" "1_34_1") -IF(LINKSTATIC) - SET(Boost_USE_STATIC_LIBS ON) -ENDIF() SET(Boost_USE_MULTITHREADED ON) @@ -25,6 +22,8 @@ MESSAGE(STATUS "Boost libraries ${Boost_LIBRARIES}") INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}") LINK_DIRECTORIES("${Boost_LIBRARY_DIRS}") +ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB) + IF(WITH_CYCLES_NETWORK) ADD_DEFINITIONS(-DWITH_NETWORK) ENDIF() @@ -126,8 +125,10 @@ IF(WITH_CYCLES_BLENDER) ${CMAKE_SOURCE_DIR}/source/blender/blenloader ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern) IF(WIN32) - SET(BLENDER_LIBRARIES ${CMAKE_BINARY_DIR}/bin/Release/blender.lib) + SET(BLENDER_LIBRARIES ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/blender.lib) ENDIF() + + ADD_DEFINITIONS(-DBLENDER_PLUGIN) ENDIF() ########################################################################### diff --git a/intern/cycles/cmake/platforms.cmake b/intern/cycles/cmake/platforms.cmake index 075b4761a85..659fd5dcad3 100644 --- a/intern/cycles/cmake/platforms.cmake +++ b/intern/cycles/cmake/platforms.cmake @@ -11,7 +11,7 @@ IF(APPLE) ENDIF(APPLE) IF(WIN32) - SET(CMAKE_CXX_FLAGS "-D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast") SET(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID") SET(PYTHON_MODULE_FLAGS "-DLL") ENDIF(WIN32) |