diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 12:10:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 12:10:50 +0300 |
commit | cd2ab75b737f17c00bca6caa6c54af76d6dcfa6f (patch) | |
tree | 923b0862186a1a548f129259887d7641bd763fb9 /source/blender/editors | |
parent | f580d9c33b30e2338c63c9997ca47abca5559053 (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/editors')
-rw-r--r-- | source/blender/editors/armature/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/object/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_file/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/CMakeLists.txt | 4 |
11 files changed, 0 insertions, 44 deletions
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index 62b76655010..b79c77d6e97 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -44,8 +44,4 @@ SET(SRC reeb.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_armature "${SRC}" "${INC}") diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 1e26f273b41..41685b7e8bb 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -45,8 +45,4 @@ SET(SRC meshtools.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 224d72895ba..01b49a9e80b 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -51,10 +51,6 @@ SET(SRC object_vgroup.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - IF(WITH_PYTHON) ADD_DEFINITIONS(-DWITH_PYTHON) ENDIF(WITH_PYTHON) diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 481f6d8df44..82c48becb0b 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -39,10 +39,6 @@ SET(SRC physics_pointcache.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - IF(NOT WITH_MOD_FLUID) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_MOD_FLUID) diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 57ee27c3b6b..c4e997ce3ee 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -52,8 +52,4 @@ IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) ENDIF(WITH_OPENMP) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_render "${SRC}" "${INC}") diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 4ea056ac400..ff143bab469 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -40,8 +40,4 @@ SET(SRC screendump.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_screen "${SRC}" "${INC}") diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 364677f9a8d..6db61cee168 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -43,8 +43,4 @@ SET(SRC sculpt_undo.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}") diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index a4b402cce43..bc89b7e1850 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -67,8 +67,4 @@ IF(WITH_IMAGE_HDR) ADD_DEFINITIONS(-DWITH_HDR) ENDIF(WITH_IMAGE_HDR) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}") diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index ca3b1f58305..d7415fb7067 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -61,8 +61,4 @@ IF(WITH_LCMS) ADD_DEFINITIONS(-DWITH_LCMS) ENDIF(WITH_LCMS) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 887d79f8fb3..aa98bfc9c0b 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -45,8 +45,4 @@ SET(SRC space_node.c ) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index e9ed8335061..0820b69ee46 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -58,10 +58,6 @@ IF(WITH_GAMEENGINE) ADD_DEFINITIONS(-DWITH_GAMEENGINE) ENDIF(WITH_GAMEENGINE) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}") |