diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-09-24 13:29:21 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-09-24 13:29:21 +0000 |
commit | b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72 (patch) | |
tree | 91435076e6a9efb9a0d93f270ff29aed0b740bd5 | |
parent | aa0f4a4bbe370032d8166628f456709be1330118 (diff) | |
download | rockbox-b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72.tar.gz rockbox-b71c66ec56f7bb2cad4d9eecd8fd3f1ebc4c3b72.zip |
Fix the build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30590 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | apps/screen_access.c | 1 | ||||
-rw-r--r-- | tools/checkwps/SOURCES | 3 | ||||
-rw-r--r-- | 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) | |||
336 | 336 | ||
337 | static void init(void) | 337 | static void init(void) |
338 | { | 338 | { |
339 | #ifdef HAVE_LCD_BITMAP | ||
339 | int i; | 340 | int i; |
341 | #endif | ||
340 | system_init(); | 342 | system_init(); |
341 | core_allocator_init(); | 343 | core_allocator_init(); |
342 | kernel_init(); | 344 | 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) | |||
69 | 69 | ||
70 | void screen_helper_setfont(int font) | 70 | void screen_helper_setfont(int font) |
71 | { | 71 | { |
72 | (int)font; | ||
72 | #ifdef HAVE_LCD_BITMAP | 73 | #ifdef HAVE_LCD_BITMAP |
73 | if (font == FONT_UI) | 74 | if (font == FONT_UI) |
74 | font = global_status.font_id[SCREEN_MAIN]; | 75 | 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 @@ | |||
1 | ../../apps/gui/skin_engine/wps_debug.c | 1 | ../../apps/gui/skin_engine/wps_debug.c |
2 | ../../apps/gui/skin_engine/skin_parser.c | 2 | ../../apps/gui/skin_engine/skin_parser.c |
3 | ../../apps/gui/skin_engine/skin_backdrops.c | 3 | ../../apps/gui/skin_engine/skin_backdrops.c |
4 | #ifdef HAVE_LCD_BITMAP | ||
5 | ../../apps/gui/skin_engine/skin_fonts.c | ||
6 | #endif | ||
7 | ../../apps/gui/viewport.c | 4 | ../../apps/gui/viewport.c |
8 | ../../apps/misc.c | 5 | ../../apps/misc.c |
9 | ../../firmware/common/strlcpy.c | 6 | ../../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 = { | |||
149 | #endif | 149 | #endif |
150 | }; | 150 | }; |
151 | 151 | ||
152 | struct system_status global_status; | ||
153 | |||
152 | int getwidth(void) { return LCD_WIDTH; } | 154 | int getwidth(void) { return LCD_WIDTH; } |
153 | int getheight(void) { return LCD_HEIGHT; } | 155 | int getheight(void) { return LCD_HEIGHT; } |
154 | #ifdef HAVE_REMOTE_LCD | 156 | #ifdef HAVE_REMOTE_LCD |
@@ -218,9 +220,9 @@ bool radio_hardware_present(void) | |||
218 | 220 | ||
219 | #ifdef HAVE_LCD_BITMAP | 221 | #ifdef HAVE_LCD_BITMAP |
220 | static int loaded_fonts = 0; | 222 | static int loaded_fonts = 0; |
221 | int font_load(struct font* pf, const char *path) | 223 | int font_load(const char *path) |
222 | { | 224 | { |
223 | int id = SYSTEMFONTCOUNT + loaded_fonts; | 225 | int id = 2 + loaded_fonts; |
224 | loaded_fonts++; | 226 | loaded_fonts++; |
225 | return id; | 227 | return id; |
226 | } | 228 | } |
@@ -273,9 +275,6 @@ int main(int argc, char **argv) | |||
273 | } | 275 | } |
274 | 276 | ||
275 | skin_buffer_init(buffer, SKIN_BUFFER_SIZE); | 277 | skin_buffer_init(buffer, SKIN_BUFFER_SIZE); |
276 | #ifdef HAVE_LCD_BITMAP | ||
277 | skin_font_init(); | ||
278 | #endif | ||
279 | 278 | ||
280 | /* Go through every skin that was thrown at us, error out at the first | 279 | /* Go through every skin that was thrown at us, error out at the first |
281 | * flawed wps */ | 280 | * flawed wps */ |