From 114815816b3f2bb8bc8e2680c93793838db66825 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Sat, 17 Sep 2022 09:36:14 -0600 Subject: Fix: lite build on windows writefile.cc includes BLI_winstuff.h which includes Windows.h which supplies definitions of min/max that conflict with the c++ headers previously windows.h was only included when TBB was enabled, the inclusion of BLI_winstuff.h now makes this define mandatory for all configurations --- source/blender/blenloader/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index f99fb21e994..bf99ca2cd9a 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -88,11 +88,10 @@ if(WITH_TBB) ${TBB_INCLUDE_DIRS} ) 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() blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -- cgit v1.2.3