scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-25 00:58:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed MinGW build.

Browse source
This commit is contained in:
bkaradzic 2013-08-30 22:31:40 -07:00
parent a68969875e
commit 1da64571d9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/common/entry/entry_windows.cpp
View file

@ -68,9 +68,9 @@ namespace entry
{ {
Context() Context()
: m_frame(true) : m_frame(true)
, m_mouseLock(false)
, m_init(false) , m_init(false)
, m_exit(false) , m_exit(false)
, m_mouseLock(false)
{ {
memset(s_translateKey, 0, sizeof(s_translateKey) ); memset(s_translateKey, 0, sizeof(s_translateKey) );
s_translateKey[VK_ESCAPE] = Key::Esc; s_translateKey[VK_ESCAPE] = Key::Esc;

8
src/bgfx_p.h
View file

@ -78,8 +78,9 @@ namespace bgfx
#define BGFX_CHUNK_MAGIC_TEX BX_MAKEFOURCC('T', 'E', 'X', 0x0) #define BGFX_CHUNK_MAGIC_TEX BX_MAKEFOURCC('T', 'E', 'X', 0x0)
#define BGFX_CHUNK_MAGIC_VSH BX_MAKEFOURCC('V', 'S', 'H', 0x1) #define BGFX_CHUNK_MAGIC_VSH BX_MAKEFOURCC('V', 'S', 'H', 0x1)
#if BGFX_CONFIG_USE_TINYSTL #include <list> // mingw wants it to be before tr1/unordered_*...
#if BGFX_CONFIG_USE_TINYSTL
namespace tinystl namespace tinystl
{ {
struct bgfx_allocator struct bgfx_allocator
@ -98,13 +99,12 @@ namespace stl = tinystl;
# include <string> # include <string>
# include <unordered_map> # include <unordered_map>
# include <unordered_set> # include <unordered_set>
namespace std { namespace tr1 {} } namespace stl
namespace stl { {
using namespace std; using namespace std;
using namespace std::tr1; using namespace std::tr1;
} }
#endif // BGFX_CONFIG_USE_TINYSTL #endif // BGFX_CONFIG_USE_TINYSTL
#include <list>
#if BX_PLATFORM_ANDROID #if BX_PLATFORM_ANDROID
# include <android/native_window.h> # include <android/native_window.h>