Sfoglia il codice sorgente

Merge pull request #31 from gtbass/master

Build fix for OSX gmake
Branimir Karadžić 12 anni fa
parent
commit
360c7e0bc2
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      premake/bgfx.lua
  2. 1 1
      src/glcontext_nsgl.mm

+ 1 - 1
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",

+ 1 - 1
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)
 	{
 	}