From 78383f7a9f9c3a2b3cc5f6c1ea0834cd7278317c Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 3 Mar 2020 09:04:31 -0700 Subject: Fix: USD Build error on windows USD is being included before the blender headers. USD includes TBB, which includes the windows headers which define rad2 as a constant conflicting with a field with that exact name in the MetaElem dna struct. Added `-DWIN32_LEAN_AND_MEAN` to keep the windows headers from defining rad2. --- source/blender/usd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/usd') diff --git a/source/blender/usd/CMakeLists.txt b/source/blender/usd/CMakeLists.txt index adaf05cd716..d85b3cfe4e5 100644 --- a/source/blender/usd/CMakeLists.txt +++ b/source/blender/usd/CMakeLists.txt @@ -26,7 +26,7 @@ if(UNIX AND NOT APPLE) add_definitions(-D_GLIBCXX_PERMIT_BACKWARD_HASH) endif() if(WIN32) - add_definitions(-DNOMINMAX) + add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) endif() add_definitions(-DPXR_STATIC) -- cgit v1.2.3