From 60d29938086e6c9b16c2d05b17c73a46ab15ffd1 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 8 Jul 2012 17:59:19 -0700 Subject: [PATCH] Fixed mingw compile errors. --- src/bgfx_p.h | 1 - src/renderer_d3d9.cpp | 1 + src/renderer_d3d9.h | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 70ee8ecd3..a1f4aed56 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -101,7 +101,6 @@ namespace std { namespace tr1 {} using namespace tr1; } // namespace std namespace stl = std; #endif // BGFX_CONFIG_USE_TINYSTL #include -#include #include "config.h" diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 1f97ee2ef..66330481c 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -300,6 +300,7 @@ namespace bgfx fmt.m_supported = SUCCEEDED(m_d3d9->CheckDeviceFormat(m_adapter, m_deviceType, adapterFormat, fmt.m_usage, fmt.m_type, fmt.m_fmt) ); const char* fourcc = (const char*)&fmt.m_fmt; BX_TRACE("\t%2d: %c%c%c%c %s", ii, fourcc[0], fourcc[1], fourcc[2], fourcc[3], fmt.m_supported ? "supported" : ""); + BX_UNUSED(fourcc); } m_instancing = false diff --git a/src/renderer_d3d9.h b/src/renderer_d3d9.h index c4ea0d44a..acfd76a17 100644 --- a/src/renderer_d3d9.h +++ b/src/renderer_d3d9.h @@ -8,6 +8,14 @@ #define BGFX_CONFIG_RENDERER_DIRECT3D_EX (BX_PLATFORM_WINDOWS && 0) +#ifndef D3DSTREAMSOURCE_INDEXEDDATA +# define D3DSTREAMSOURCE_INDEXEDDATA (1<<30) +#endif// D3DSTREAMSOURCE_INDEXEDDATA + +#ifndef D3DSTREAMSOURCE_INSTANCEDATA +# define D3DSTREAMSOURCE_INSTANCEDATA (2<<30) +#endif // D3DSTREAMSOURCE_INSTANCEDATA + #if BX_PLATFORM_WINDOWS # if !BGFX_CONFIG_RENDERER_DIRECT3D_EX # define D3D_DISABLE_9EX