diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-09-18 15:51:36 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-09-18 15:51:36 +0000 |
| commit | 1509eda35284f00d89c58fc8b70da4a691f1e977 (patch) | |
| tree | f26296c2286351676e9bd3e02ba663aac1cb3d6e /Graphics | |
| parent | Updated SPIRV-Cross module (diff) | |
| download | DiligentCore-1509eda35284f00d89c58fc8b70da4a691f1e977.tar.gz DiligentCore-1509eda35284f00d89c58fc8b70da4a691f1e977.zip | |
Fixed some issues on Win32 platform
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/include/pch.h | 9 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/include/pch.h | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h index a995ded5..a181b137 100644 --- a/Graphics/GraphicsEngineD3D11/include/pch.h +++ b/Graphics/GraphicsEngineD3D11/include/pch.h @@ -30,8 +30,13 @@ #include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#endif + +#ifndef NOMINMAX +# define NOMINMAX +#endif #include "PlatformDefinitions.h" diff --git a/Graphics/GraphicsEngineD3D12/include/pch.h b/Graphics/GraphicsEngineD3D12/include/pch.h index 093a366f..733f3ef6 100644 --- a/Graphics/GraphicsEngineD3D12/include/pch.h +++ b/Graphics/GraphicsEngineD3D12/include/pch.h @@ -28,8 +28,13 @@ #pragma once -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#endif + +#ifndef NOMINMAX +# define NOMINMAX +#endif #include <vector> |