From ccde54722f2c284fb0e7fc273d65c57a3be71db1 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Mon, 8 Jun 2015 14:14:40 +1000
Subject: Added ability to compile ugfx as a single file (excluding driver and
 board files). Simply compile src/gfx_mk.c

---
 src/gdisp/mcufont/mf_font.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/gdisp/mcufont/mf_font.c')

diff --git a/src/gdisp/mcufont/mf_font.c b/src/gdisp/mcufont/mf_font.c
index 7a4ebf95..ccf71bec 100644
--- a/src/gdisp/mcufont/mf_font.c
+++ b/src/gdisp/mcufont/mf_font.c
@@ -5,10 +5,18 @@
  *              http://ugfx.org/license.html
  */
 
-#include "mf_font.h"
+#include "mf_config.h"
 
 #ifndef MF_NO_COMPILE
 
+#define MF_BWFONT_INTERNALS
+#define MF_RLEFONT_INTERNALS
+#define MF_SCALEDFONT_INTERNALS
+#include "mf_font.h"
+#include "mf_rlefont.h"
+#include "mf_bwfont.h"
+#include "mf_scaledfont.h"
+
 #include <stdbool.h>
 
 /* This will be made into a list of included fonts using macro magic. */
@@ -40,7 +48,7 @@ uint8_t mf_character_width(const struct mf_font_s *font,
                            mf_char character)
 {
     uint8_t width;
-    width = font->character_width(font, character);
+    width = font->character_width(font, MFCHAR2UINT16(character));
     
     if (!width)
     {
-- 
cgit v1.2.3