Просмотр исходного кода

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.

Garett Bass 12 лет назад
Родитель
Сommit
7e128dfae7
2 измененных файлов с 2 добавлено и 2 удалено
  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",
 			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",

+ 1 - 1
src/glcontext_nsgl.mm

@@ -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)
 	{
 	{
 	}
 	}