mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed VS2012 warning when DXSDK and WindowsSDK are included.

Browse Source
This commit is contained in:
bkaradzic 2014-08-27 20:11:23 -07:00
parent 931d7f3196
commit 81c4b7d2ae
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer_d3d11.h
View File

@ -14,7 +14,15 @@
#endif // !USE_D3D11_DYNAMIC_LIB #endif // !USE_D3D11_DYNAMIC_LIB
#define D3D11_NO_HELPERS #define D3D11_NO_HELPERS
#include <d3d11.h> #if BX_COMPILER_MSVC
# pragma warning(push)
// winerror.h and dxgitypes.h both define DXGI_ERRORs.
# pragma warning(disable:4005) // warning C4005: '' : macro redefinition
# include <d3d11.h>
# pragma warning(pop)
#else
# include <d3d11.h>
#endif // BX_COMPILER_MSVC
#include "renderer_d3d.h" #include "renderer_d3d.h"
#define D3DCOLOR_ARGB(_a, _r, _g, _b) ( (DWORD)( ( ( (_a)&0xff)<<24)|( ( (_r)&0xff)<<16)|( ( (_g)&0xff)<<8)|( (_b)&0xff) ) ) #define D3DCOLOR_ARGB(_a, _r, _g, _b) ( (DWORD)( ( ( (_a)&0xff)<<24)|( ( (_r)&0xff)<<16)|( ( (_g)&0xff)<<8)|( (_b)&0xff) ) )