Fix: MSVC build error without TBB
windows.h once more providing min/max macro's when you least want them.
This commit is contained in:
parent
4ecc7cf14a
commit
828525b268
|
@ -101,11 +101,10 @@ if(WITH_TBB)
|
||||||
${TBB_INCLUDE_DIRS}
|
${TBB_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
add_definitions(-DWITH_TBB)
|
add_definitions(-DWITH_TBB)
|
||||||
if(WIN32)
|
|
||||||
# TBB includes Windows.h which will define min/max macros
|
|
||||||
# that will collide with the stl versions.
|
|
||||||
add_definitions(-DNOMINMAX)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
add_definitions(-DNOMINMAX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||||
|
|
Loading…
Reference in New Issue