summaryrefslogtreecommitdiffstats
path: root/tools/checkwps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-09-24 13:29:21 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-09-24 13:29:21 +0000
commitb71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72 (patch)
tree91435076e6a9efb9a0d93f270ff29aed0b740bd5 /tools/checkwps
parentaa0f4a4bbe370032d8166628f456709be1330118 (diff)
downloadrockbox-b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72.tar.gz
rockbox-b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72.tar.bz2
rockbox-b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72.zip
Fix the build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30590 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/checkwps')
-rw-r--r--tools/checkwps/SOURCES3
-rw-r--r--tools/checkwps/checkwps.c9
2 files changed, 4 insertions, 8 deletions
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 */