forked from bartvdbraak/blender
- include pthreads for win32 globally (as with opengl).
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
This commit is contained in:
parent
f580d9c33b
commit
cd2ab75b73
@ -667,6 +667,9 @@ IF(WIN32)
|
||||
|
||||
ENDIF(MSVC)
|
||||
|
||||
# used in many places so include globally, like OpenGL
|
||||
INCLUDE_DIRECTORIES(${PTHREADS_INC})
|
||||
|
||||
ENDIF(WIN32)
|
||||
|
||||
|
||||
|
@ -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}")
|
||||
|
@ -86,10 +86,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
LIST(APPEND INC "${BINRELOC_INC}")
|
||||
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_OPENMP)
|
||||
ADD_DEFINITIONS(-DPARALLEL=1)
|
||||
ENDIF(WITH_OPENMP)
|
||||
|
@ -37,10 +37,6 @@ SET(SRC
|
||||
intern/pluginapi.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_QUICKTIME)
|
||||
LIST(APPEND INC ${QUICKTIME_INC})
|
||||
ADD_DEFINITIONS(-DWITH_QUICKTIME)
|
||||
|
@ -44,8 +44,4 @@ SET(SRC
|
||||
reeb.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
|
||||
|
@ -45,8 +45,4 @@ SET(SRC
|
||||
meshtools.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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}")
|
||||
|
@ -40,8 +40,4 @@ SET(SRC
|
||||
screendump.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
|
||||
|
@ -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}")
|
||||
|
@ -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}")
|
||||
|
@ -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}")
|
||||
|
@ -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}")
|
||||
|
@ -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}")
|
||||
|
@ -46,10 +46,6 @@ SET(SRC
|
||||
intern/gpu_shader_vertex.glsl.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
INCLUDE_DIRECTORIES(${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_DEFINITIONS(-DGLEW_STATIC)
|
||||
|
||||
BLENDERLIB(bf_gpu "${SRC}" "${INC}")
|
||||
|
@ -66,10 +66,6 @@ SET(SRC
|
||||
intern/writeimage.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_IMAGE_OPENEXR)
|
||||
ADD_DEFINITIONS(-DWITH_OPENEXR)
|
||||
ENDIF(WITH_IMAGE_OPENEXR)
|
||||
|
@ -69,10 +69,6 @@ IF(WITH_PYTHON)
|
||||
ADD_DEFINITIONS(-DWITH_PYTHON)
|
||||
ENDIF(WITH_PYTHON)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_GAMEENGINE)
|
||||
ADD_DEFINITIONS(-DWITH_GAMEENGINE)
|
||||
ENDIF(WITH_GAMEENGINE)
|
||||
|
@ -140,10 +140,6 @@ SET(SRC
|
||||
intern/node_util.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_PYTHON)
|
||||
SET(INC ${INC} ../python ${PYTHON_INC})
|
||||
ADD_DEFINITIONS(-DWITH_PYTHON)
|
||||
|
@ -77,10 +77,6 @@ SET(SRC
|
||||
intern/source/zbuf.c
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_IMAGE_OPENEXR)
|
||||
ADD_DEFINITIONS(-DWITH_OPENEXR)
|
||||
ENDIF(WITH_IMAGE_OPENEXR)
|
||||
|
@ -93,10 +93,6 @@ IF(WITH_GAMEENGINE)
|
||||
ADD_DEFINITIONS(-DWITH_GAMEENGINE)
|
||||
ENDIF(WITH_GAMEENGINE)
|
||||
|
||||
IF(WIN32)
|
||||
LIST(APPEND INC ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_COCOA)
|
||||
LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
|
||||
ENDIF(WITH_COCOA)
|
||||
|
Loading…
Reference in New Issue
Block a user