Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-11-21 12:10:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-11-21 12:10:50 +0300
commitcd2ab75b737f17c00bca6caa6c54af76d6dcfa6f (patch)
tree923b0862186a1a548f129259887d7641bd763fb9 /source/blender/blenkernel
parentf580d9c33b30e2338c63c9997ca47abca5559053 (diff)
- include pthreads for win32 globally (as with opengl).
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/CMakeLists.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index eb564720915..d88b25d4335 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -213,9 +213,8 @@ IF(WITH_LZMA)
ADD_DEFINITIONS(-DWITH_LZMA)
ENDIF(WITH_LZMA)
-IF(WIN32)
+IF(MSVC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
+ENDIF(MSVC)
BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")