[Bf-blender-cvs] [b46dcaf] master: fix building cycles standalone on windows / cmake

[Martijn Berger]

Commit: b46dcafa7aeef69389ce5f45fb7982a37191534c
Author: Martijn Berger
Date:   Sat Jan 25 14:19:32 2014 +0100
https://developer.blender.org/rBb46dcafa7aeef69389ce5f45fb7982a37191534c

fix building cycles standalone on windows / cmake

===================================================================

M	CMakeLists.txt
M	intern/cycles/app/CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 271b33d..ac2643b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2258,7 +2258,7 @@ if(WITH_BLENDER OR WITH_PLAYER)
 	add_subdirectory(extern)
 elseif(WITH_CYCLES_STANDALONE)
 	add_subdirectory(intern/cycles)
-	if(WITH_CYCLES_STANDALONE_GUI)
+	if(NOT WITH_SYSTEM_GLEW)
 		add_subdirectory(extern/glew)
 	endif()
 endif()
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index ada5ea5..64d710e 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -54,6 +54,7 @@ if(WITH_CYCLES_STANDALONE)
 		cycles_xml.h
 	)
 	add_executable(cycles ${SRC})
+	list(APPEND LIBRARIES ${PLATFORM_LINKLIBS})
 	target_link_libraries(cycles ${LIBRARIES} ${CMAKE_DL_LIBS})
 
 	if(UNIX AND NOT APPLE)