commit 92e2531dca068bdb403b137f5699a92e512085c4
author Dees Troy <dees_troy@teamw.in> Sat Jun 10 15:52:31 2017 +0200
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Sat Jun 10 15:52:31 2017 +0200
tree 9eb77f9e2a86b4ff0cccc459b3b6b3384e670500
parent 52dc0ea4f9e61a7fcc875b18a82855b644f082c4
parent 39662b2914269832879690f2bbe82a0e87d00ded

Merge "Fix minui issues for some build trees" into android-7.1

minui/Android.mk

diff --git a/minui/Android.mk b/minui/Android.mk
index 34bf5f5..249feeb 100644
--- a/minui/Android.mk
+++ b/minui/Android.mk
@@ -79,8 +79,9 @@
 ifneq ($(BOARD_USE_CUSTOM_RECOVERY_FONT),)
   LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=$(BOARD_USE_CUSTOM_RECOVERY_FONT)
 endif
-ifneq ($(wildcard system/core/healthd/animation.h),)
-    LOCAL_CFLAGS += -DTW_USE_MINUI_CUSTOM_FONTS
+ifeq ($(wildcard system/core/healthd/animation.h),)
+    TARGET_GLOBAL_CFLAGS += -DTW_NO_MINUI_CUSTOM_FONTS
+    CLANG_TARGET_GLOBAL_CFLAGS += -DTW_NO_MINUI_CUSTOM_FONTS
 endif
 include $(BUILD_STATIC_LIBRARY)
 

minui/graphics.cpp

diff --git a/minui/graphics.cpp b/minui/graphics.cpp
index 3d847b5..9525176 100644
--- a/minui/graphics.cpp
+++ b/minui/graphics.cpp
@@ -62,8 +62,8 @@
 {
     return x < 0 || x >= gr_draw->width || y < 0 || y >= gr_draw->height;
 }
-//#define TW_USE_MINUI_CUSTOM_FONTS 1
-#ifndef TW_USE_MINUI_CUSTOM_FONTS
+
+#ifdef TW_NO_MINUI_CUSTOM_FONTS
 int gr_measure(const char *s)
 {
     return gr_font->char_width * strlen(s);
@@ -90,7 +90,7 @@
     *x = font->char_width;
     *y = font->char_height;
 }
-#endif // TW_USE_MINUI_CUSTOM_FONTS
+#endif // TW_NO_MINUI_CUSTOM_FONTS
 
 void blend_16bpp(unsigned char* px, unsigned r5, unsigned g5, unsigned b5, unsigned char a)
 {
@@ -158,7 +158,7 @@
     }
 }
 
-#ifndef TW_USE_MINUI_CUSTOM_FONTS
+#ifdef TW_NO_MINUI_CUSTOM_FONTS
 void gr_text(int x, int y, const char *s, bool bold)
 {
     GRFont* font = gr_font;
@@ -189,7 +189,7 @@
         x += font->char_width;
     }
 }
-#else //TW_USE_MINUI_CUSTOM_FONTS
+#else //TW_NO_MINUI_CUSTOM_FONTS
 void gr_text(const GRFont* font, int x, int y, const char *s, bool bold)
 {
     if (!font->texture || gr_current_a == 0) return;
@@ -218,7 +218,7 @@
         x += font->char_width;
     }
 }
-#endif //TW_USE_MINUI_CUSTOM_FONTS
+#endif //TW_NO_MINUI_CUSTOM_FONTS
 
 void gr_texticon(int x, int y, GRSurface* icon) {
     if (icon == NULL) return;
@@ -426,7 +426,7 @@
     return surface->height;
 }
 
-#ifndef TW_USE_MINUI_CUSTOM_FONTS
+#ifdef TW_NO_MINUI_CUSTOM_FONTS
 static void gr_init_font(void)
 {
     gr_font = reinterpret_cast<GRFont*>(calloc(sizeof(*gr_font), 1));
@@ -468,7 +468,7 @@
 	gr_init_font();
 	return;
 }
-#else
+#else // TW_NO_MINUI_CUSTOM_FONTS
 int gr_init_font(const char* name, GRFont** dest) {
     GRFont* font = reinterpret_cast<GRFont*>(calloc(1, sizeof(*gr_font)));
     if (font == nullptr) {
@@ -523,7 +523,7 @@
     gr_font->char_width = font.char_width;
     gr_font->char_height = font.char_height;
 }
-#endif
+#endif // TW_NO_MINUI_CUSTOM_FONTS
 
 #if 0
 // Exercises many of the gr_*() functions; useful for testing.

minui/minui.h

diff --git a/minui/minui.h b/minui/minui.h
index abef036..bf79601 100644
--- a/minui/minui.h
+++ b/minui/minui.h
@@ -55,7 +55,7 @@
 void gr_fill(int x1, int y1, int x2, int y2);
 
 void gr_texticon(int x, int y, GRSurface* icon);
-#ifndef TW_USE_MINUI_CUSTOM_FONTS
+#ifdef TW_NO_MINUI_CUSTOM_FONTS
 void gr_text(int x, int y, const char *s, bool bold);
 int gr_measure(const char *s);
 void gr_font_size(int *x, int *y);