medfall

commit 6b94912fc7f458f0abc2b699e7f1cefed8e981f9
parent 24226e5581dfeeeb8203456d5bc647a9a96afc3e
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun May 28 19:19:55 +0300

Oops

Diffstat:
libs/imgui.lua
 | 
1
+
renderer.cc
 | 
2
+-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/libs/imgui.lua b/libs/imgui.lua
@@ -1,2 +1,3 @@
 lib( "imgui", { "libs/imgui/imgui", "libs/imgui/imgui_draw", "libs/imgui/imgui_impl_glfw_gl3" } )
 linux_obj_cxxflags( "libs/imgui/imgui_draw", "-Wno-maybe-uninitialized -DIMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION -DIMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION" )
+windows_obj_cxxflags( "libs/imgui/imgui_draw", "/DIMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION /DIMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION" )
diff --git a/renderer.cc b/renderer.cc
@@ -310,7 +310,7 @@ Shader renderer_new_shader( ShaderConfig config ) {
 	}
 
 	const char * ubo_names[] = { "v_cold", "f_hot", "view", "model", "light_view" };
-	for( size_t i = 0; i < ARRAY_COUNT( ubo_names ); i++ ) {
+	for( GLuint i = 0; i < ARRAY_COUNT( ubo_names ); i++ ) {
 		GLuint idx = glGetUniformBlockIndex( program, ubo_names[ i ] );
 		if( idx != GL_INVALID_INDEX ) {
 			glUniformBlockBinding( program, idx, i );