diff options
| author | José Fonseca <jfonseca@vmware.com> | 2012-12-07 11:37:16 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2012-12-07 11:38:55 +0000 |
| commit | 2157e63ae3d1b8378c224ed18555295a94d488d9 (patch) | |
| tree | ca2242ef568464d406575c436e67b4096ad3891a /thirdparty/directxtex | |
| parent | 400cd6589ff21fa885b6cd799ecd730384a14509 (diff) | |
directxtex: Don't redefine NOMINMAX.
Diffstat (limited to 'thirdparty/directxtex')
| -rw-r--r-- | thirdparty/directxtex/DirectXTex/DirectXTexP.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/thirdparty/directxtex/DirectXTex/DirectXTexP.h b/thirdparty/directxtex/DirectXTex/DirectXTexP.h index b5302546..88c9d55f 100644 --- a/thirdparty/directxtex/DirectXTex/DirectXTexP.h +++ b/thirdparty/directxtex/DirectXTex/DirectXTexP.h @@ -17,7 +17,9 @@ #pragma once #endif +#ifndef NOMINMAX #define NOMINMAX +#endif #include <windows.h> #ifdef USE_XNAMATH |