From b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Sat, 24 Sep 2011 13:29:21 +0000
Subject: [PATCH] Fix the build errors

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30590 a1c6a512-1295-4272-9138-f99709370657
---
 apps/main.c               | 2 ++
 apps/screen_access.c      | 1 +
 tools/checkwps/SOURCES    | 3 ---
 tools/checkwps/checkwps.c | 9 ++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/main.c b/apps/main.c
index ae666adc06..a6178829b8 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -336,7 +336,9 @@ static void init_tagcache(void)
 
 static void init(void)
 {
+#ifdef HAVE_LCD_BITMAP
     int i;
+#endif
     system_init();
     core_allocator_init();
     kernel_init();
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 0b206a668a..f9c2fbbbe3 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -69,6 +69,7 @@ static int screen_helper_getnblines(void)
 
 void screen_helper_setfont(int font)
 {
+    (int)font;
 #ifdef HAVE_LCD_BITMAP
     if (font == FONT_UI)
         font = global_status.font_id[SCREEN_MAIN];
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES
index 3e12d1f74e..ab194ad68c 100644
--- a/tools/checkwps/SOURCES
+++ b/tools/checkwps/SOURCES
@@ -1,9 +1,6 @@
 ../../apps/gui/skin_engine/wps_debug.c
 ../../apps/gui/skin_engine/skin_parser.c
 ../../apps/gui/skin_engine/skin_backdrops.c
-#ifdef HAVE_LCD_BITMAP
-../../apps/gui/skin_engine/skin_fonts.c
-#endif
 ../../apps/gui/viewport.c
 ../../apps/misc.c
 ../../firmware/common/strlcpy.c
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 39d4358320..e104928909 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -149,6 +149,8 @@ struct user_settings global_settings = {
 #endif
 };
 
+struct system_status global_status;
+
 int getwidth(void) { return LCD_WIDTH; }
 int getheight(void) { return LCD_HEIGHT; }
 #ifdef HAVE_REMOTE_LCD
@@ -218,9 +220,9 @@ bool radio_hardware_present(void)
 
 #ifdef HAVE_LCD_BITMAP
 static int loaded_fonts = 0;
-int font_load(struct font* pf, const char *path)
+int font_load(const char *path)
 {
-    int id = SYSTEMFONTCOUNT + loaded_fonts;
+    int id = 2 + loaded_fonts;
     loaded_fonts++;
     return id;
 }
@@ -273,9 +275,6 @@ int main(int argc, char **argv)
     }
 
     skin_buffer_init(buffer, SKIN_BUFFER_SIZE);
-#ifdef HAVE_LCD_BITMAP
-    skin_font_init();
-#endif
 
     /* Go through every skin that was thrown at us, error out at the first
      * flawed wps */
-- 
2.11.4.GIT