diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-01-25 17:19:32 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-01-25 17:20:25 +0400 |
| commit | b46dcafa7aeef69389ce5f45fb7982a37191534c (patch) | |
| tree | 9876176a0fea270a6eab644e86ed487e2aa41ea5 | |
| parent | 1dd05a1e7bd2d416666367da4e22c49ce5d47ac5 (diff) | |
fix building cycles standalone on windows / cmake
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 271b33d871d..ac2643bbea1 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 ada5ea55fb2..64d710ef9d0 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) |