Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- include pthreads for win32 globally (as with opengl).

Browse Source 
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
This commit is contained in:
Campbell Barton
2010-11-21 09:10:50 +00:00
parent f580d9c33b
commit cd2ab75b73
21 changed files with 5 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -667,6 +667,9 @@ IF(WIN32)
ENDIF(MSVC) ENDIF(MSVC)
# used in many places so include globally, like OpenGL
INCLUDE_DIRECTORIES(${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)

5
source/blender/blenkernel/CMakeLists.txt
View File

@@ -213,9 +213,8 @@ IF(WITH_LZMA)
ADD_DEFINITIONS(-DWITH_LZMA) ADD_DEFINITIONS(-DWITH_LZMA)
ENDIF(WITH_LZMA) ENDIF(WITH_LZMA)
IF(WIN32) IF(MSVC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
LIST(APPEND INC ${PTHREADS_INC}) ENDIF(MSVC)
ENDIF(WIN32)
BLENDERLIB(bf_blenkernel "${SRC}" "${INC}") BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")

4
source/blender/blenlib/CMakeLists.txt
View File

@@ -86,10 +86,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
LIST(APPEND INC "${BINRELOC_INC}") LIST(APPEND INC "${BINRELOC_INC}")
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_OPENMP) IF(WITH_OPENMP)
ADD_DEFINITIONS(-DPARALLEL=1) ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)

4
source/blender/blenpluginapi/CMakeLists.txt
View File

@@ -37,10 +37,6 @@ SET(SRC
intern/pluginapi.c intern/pluginapi.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)
LIST(APPEND INC ${QUICKTIME_INC}) LIST(APPEND INC ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)

4
source/blender/editors/armature/CMakeLists.txt
View File

@@ -44,8 +44,4 @@ SET(SRC
reeb.c reeb.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_armature "${SRC}" "${INC}") BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")

4
source/blender/editors/mesh/CMakeLists.txt
View File

@@ -45,8 +45,4 @@ SET(SRC
meshtools.c meshtools.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}") BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")

4
source/blender/editors/object/CMakeLists.txt
View File

@@ -51,10 +51,6 @@ SET(SRC
object_vgroup.c object_vgroup.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_PYTHON) IF(WITH_PYTHON)
ADD_DEFINITIONS(-DWITH_PYTHON) ADD_DEFINITIONS(-DWITH_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

4
source/blender/editors/physics/CMakeLists.txt
View File

@@ -39,10 +39,6 @@ SET(SRC
physics_pointcache.c physics_pointcache.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(NOT WITH_MOD_FLUID) IF(NOT WITH_MOD_FLUID)
ADD_DEFINITIONS(-DDISABLE_ELBEEM) ADD_DEFINITIONS(-DDISABLE_ELBEEM)
ENDIF(NOT WITH_MOD_FLUID) ENDIF(NOT WITH_MOD_FLUID)

4
source/blender/editors/render/CMakeLists.txt
View File

@@ -52,8 +52,4 @@ IF(WITH_OPENMP)
ADD_DEFINITIONS(-DPARALLEL=1) ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_render "${SRC}" "${INC}") BLENDERLIB(bf_editor_render "${SRC}" "${INC}")

4
source/blender/editors/screen/CMakeLists.txt
View File

@@ -40,8 +40,4 @@ SET(SRC
screendump.c screendump.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_screen "${SRC}" "${INC}") BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")

4
source/blender/editors/sculpt_paint/CMakeLists.txt
View File

@@ -43,8 +43,4 @@ SET(SRC
sculpt_undo.c sculpt_undo.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}") BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")

4
source/blender/editors/space_file/CMakeLists.txt
View File

@@ -67,8 +67,4 @@ IF(WITH_IMAGE_HDR)
ADD_DEFINITIONS(-DWITH_HDR) ADD_DEFINITIONS(-DWITH_HDR)
ENDIF(WITH_IMAGE_HDR) ENDIF(WITH_IMAGE_HDR)
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")

4
source/blender/editors/space_image/CMakeLists.txt
View File

@@ -61,8 +61,4 @@ IF(WITH_LCMS)
ADD_DEFINITIONS(-DWITH_LCMS) ADD_DEFINITIONS(-DWITH_LCMS)
ENDIF(WITH_LCMS) ENDIF(WITH_LCMS)
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")

4
source/blender/editors/space_node/CMakeLists.txt
View File

@@ -45,8 +45,4 @@ SET(SRC
space_node.c space_node.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")

4
source/blender/editors/space_view3d/CMakeLists.txt
View File

@@ -58,10 +58,6 @@ IF(WITH_GAMEENGINE)
ADD_DEFINITIONS(-DWITH_GAMEENGINE) ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE) ENDIF(WITH_GAMEENGINE)
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}")

4
source/blender/gpu/CMakeLists.txt
View File

@@ -46,10 +46,6 @@ SET(SRC
intern/gpu_shader_vertex.glsl.c intern/gpu_shader_vertex.glsl.c
) )
IF(WIN32)
INCLUDE_DIRECTORIES(${PTHREADS_INC})
ENDIF(WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(bf_gpu "${SRC}" "${INC}") BLENDERLIB(bf_gpu "${SRC}" "${INC}")

4
source/blender/imbuf/CMakeLists.txt
View File

@@ -66,10 +66,6 @@ SET(SRC
intern/writeimage.c intern/writeimage.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_IMAGE_OPENEXR) IF(WITH_IMAGE_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_IMAGE_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR)

4
source/blender/makesrna/intern/CMakeLists.txt
View File

@@ -69,10 +69,6 @@ IF(WITH_PYTHON)
ADD_DEFINITIONS(-DWITH_PYTHON) ADD_DEFINITIONS(-DWITH_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_GAMEENGINE) IF(WITH_GAMEENGINE)
ADD_DEFINITIONS(-DWITH_GAMEENGINE) ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE) ENDIF(WITH_GAMEENGINE)

4
source/blender/nodes/CMakeLists.txt
View File

@@ -140,10 +140,6 @@ SET(SRC
intern/node_util.c intern/node_util.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ../python ${PYTHON_INC}) SET(INC ${INC} ../python ${PYTHON_INC})
ADD_DEFINITIONS(-DWITH_PYTHON) ADD_DEFINITIONS(-DWITH_PYTHON)

4
source/blender/render/CMakeLists.txt
View File

@@ -77,10 +77,6 @@ SET(SRC
intern/source/zbuf.c intern/source/zbuf.c
) )
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_IMAGE_OPENEXR) IF(WITH_IMAGE_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_IMAGE_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR)

4
source/blender/windowmanager/CMakeLists.txt
View File

@@ -93,10 +93,6 @@ IF(WITH_GAMEENGINE)
ADD_DEFINITIONS(-DWITH_GAMEENGINE) ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE) ENDIF(WITH_GAMEENGINE)
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_COCOA) IF(WITH_COCOA)
LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c") LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
ENDIF(WITH_COCOA) ENDIF(WITH_COCOA)