Merge pull request #31 from gtbass/master

Build fix for OSX gmake
This commit is contained in:
Branimir Karadžić 2013-05-05 23:54:32 -07:00
commit 360c7e0bc2
2 changed files with 2 additions and 2 deletions

View file

@ -30,7 +30,7 @@ project "bgfx"
BGFX_DIR .. "src/**.mm", BGFX_DIR .. "src/**.mm",
} }
configuration { "vs* or linux or mingw" } configuration { "vs* or linux or mingw or osx" }
includedirs { includedirs {
--nacl has GLES2 headers modified... --nacl has GLES2 headers modified...
BGFX_DIR .. "3rdparty/glext", BGFX_DIR .. "3rdparty/glext",

View file

@ -80,7 +80,7 @@ namespace bgfx
[glView release]; [glView release];
} }
void GlContext::resize(uint32_t _width, uint32_t _height) void GlContext::resize(uint32_t _width, uint32_t _height, bool _vsync)
{ {
} }