[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33207] trunk/blender: - include pthreads for win32 globally (as with opengl).
Campbell Barton
ideasman42 at gmail.com
Sun Nov 21 10:10:50 CET 2010
Revision: 33207
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33207
Author: campbellbarton
Date: 2010-11-21 10:10:50 +0100 (Sun, 21 Nov 2010)
Log Message:
-----------
- include pthreads for win32 globally (as with opengl).
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -667,6 +667,9 @@
ENDIF(MSVC)
+ # used in many places so include globally, like OpenGL
+ INCLUDE_DIRECTORIES(${PTHREADS_INC})
+
ENDIF(WIN32)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -213,9 +213,8 @@
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}")
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -86,10 +86,6 @@
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)
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -37,10 +37,6 @@
intern/pluginapi.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
IF(WITH_QUICKTIME)
LIST(APPEND INC ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -44,8 +44,4 @@
reeb.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -45,8 +45,4 @@
meshtools.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/object/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/object/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/object/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -51,10 +51,6 @@
object_vgroup.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
IF(WITH_PYTHON)
ADD_DEFINITIONS(-DWITH_PYTHON)
ENDIF(WITH_PYTHON)
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -39,10 +39,6 @@
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)
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -52,8 +52,4 @@
ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/screen/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/screen/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -40,8 +40,4 @@
screendump.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -43,8 +43,4 @@
sculpt_undo.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -67,8 +67,4 @@
ADD_DEFINITIONS(-DWITH_HDR)
ENDIF(WITH_IMAGE_HDR)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -61,8 +61,4 @@
ADD_DEFINITIONS(-DWITH_LCMS)
ENDIF(WITH_LCMS)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_node/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_node/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/space_node/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -45,8 +45,4 @@
space_node.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -58,10 +58,6 @@
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}")
Modified: trunk/blender/source/blender/gpu/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/gpu/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/gpu/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -46,10 +46,6 @@
intern/gpu_shader_vertex.glsl.c
)
-IF(WIN32)
- INCLUDE_DIRECTORIES(${PTHREADS_INC})
-ENDIF(WIN32)
-
ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(bf_gpu "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -66,10 +66,6 @@
intern/writeimage.c
)
-IF(WIN32)
- LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
IF(WITH_IMAGE_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_IMAGE_OPENEXR)
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -69,10 +69,6 @@
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)
Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/nodes/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -140,10 +140,6 @@
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)
Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
+++ trunk/blender/source/blender/render/CMakeLists.txt 2010-11-21 09:10:50 UTC (rev 33207)
@@ -77,10 +77,6 @@
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)
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-11-21 09:06:27 UTC (rev 33206)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list