diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-03-03 19:04:31 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-03 19:04:31 +0300 |
| commit | 78383f7a9f9c3a2b3cc5f6c1ea0834cd7278317c (patch) | |
| tree | 4d0054f6560b7c1bc6061b994f7f19955ddbed2d /source/blender/usd | |
| parent | daca00f187ea2cc8906094058f45ed9e4c0b13da (diff) | |
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.
Diffstat (limited to 'source/blender/usd')
| -rw-r--r-- | source/blender/usd/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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) |