(libvita2d) Buildfixes

cnhhbfx · Jul 31, 2016 · a676ce8 · a676ce8
1 parent 6093499
commit a676ce8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/deps/libvita2d/include/shared.h b/deps/libvita2d/include/shared.h
@@ -11,7 +11,7 @@ extern SceGxmFragmentProgram *_vita2d_textureFragmentProgram;
 extern SceGxmFragmentProgram *_vita2d_textureTintFragmentProgram;
 extern const SceGxmProgramParameter *_vita2d_colorWvpParam;
 extern const SceGxmProgramParameter *_vita2d_textureWvpParam;
-extern SceGxmProgramParameter *_vita2d_textureTintColorParam;
+extern const SceGxmProgramParameter *_vita2d_textureTintColorParam;
 
 
 #endif
diff --git a/deps/libvita2d/source/vita2d_pgf.c b/deps/libvita2d/source/vita2d_pgf.c
@@ -82,7 +82,7 @@ void vita2d_free_pgf(vita2d_pgf *font)
 	}
 }
 
-static int atlas_add_glyph(vita2d_pgf *font, unsigned int character)
+static int atlas_add_glyph_pgf(vita2d_pgf *font, unsigned int character)
 {
 	SceFontCharInfo char_info;
 	if (sceFontGetCharInfo(font->font_handle, character, &char_info) < 0)
@@ -121,7 +121,7 @@ int vita2d_pgf_draw_text(vita2d_pgf *font, int x, int y, unsigned int color, flo
 		unsigned int character = *text++;
 
 		if (!texture_atlas_exists(font->tex_atlas, character)) {
-			if (!atlas_add_glyph(font, character)) {
+			if (!atlas_add_glyph_pgf(font, character)) {
 				continue;
 			}
 		}
@@ -168,7 +168,7 @@ void vita2d_pgf_text_dimensions(vita2d_pgf *font, float scale, const char *text,
 		unsigned int character = *text++;
 
 		if (!texture_atlas_exists(font->tex_atlas, character)) {
-			if (!atlas_add_glyph(font, character)) {
+			if (!atlas_add_glyph_pgf(font, character)) {
 				continue;
 			}
 		}

diff --git a/menu/menu_shader.c b/menu/menu_shader.c
@@ -347,6 +347,8 @@ bool menu_shader_manager_save_preset(
    }
    else
       return true;
+#else
+   return false;
 #endif
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -347,6 +347,8 @@ bool menu_shader_manager_save_preset( @@
        }
        else
           return true;
+    #else
+       return false;
     #endif
     }
@@ Expand Down @@