From 7e128dfae792f5872d9cbcd0fa520eb5c8f81ecd Mon Sep 17 00:00:00 2001 From: Garett Bass Date: Sun, 5 May 2013 23:10:01 -0700 Subject: [PATCH] Build fix for OSX gmake. Outstanding issues: gmake binaries fail for unknown reason, XCode projects not picking up bx/include/compat/osx for unknown reason. --- premake/bgfx.lua | 2 +- src/glcontext_nsgl.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/premake/bgfx.lua b/premake/bgfx.lua index 19c019ea..5b7cbc91 100755 --- a/premake/bgfx.lua +++ b/premake/bgfx.lua @@ -30,7 +30,7 @@ project "bgfx" BGFX_DIR .. "src/**.mm", } - configuration { "vs* or linux or mingw" } + configuration { "vs* or linux or mingw or osx" } includedirs { --nacl has GLES2 headers modified... BGFX_DIR .. "3rdparty/glext", diff --git a/src/glcontext_nsgl.mm b/src/glcontext_nsgl.mm index 316ab517..9236b44e 100755 --- a/src/glcontext_nsgl.mm +++ b/src/glcontext_nsgl.mm @@ -80,7 +80,7 @@ namespace bgfx [glView release]; } - void GlContext::resize(uint32_t _width, uint32_t _height) + void GlContext::resize(uint32_t _width, uint32_t _height, bool _vsync) { }