diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-01-29 20:49:43 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-01-29 20:49:43 +0000 |
| commit | 36c71a60ca82f9777fbdd239f63f62ccf68cf3f5 (patch) | |
| tree | 06518f1485a9899da1015445623256721435323e /apps | |
| parent | d4b99fdfe06bf5f30f4c3a68f08aedaaa6f432f9 (diff) | |
| download | rockbox-36c71a60ca82f9777fbdd239f63f62ccf68cf3f5.tar.gz rockbox-36c71a60ca82f9777fbdd239f63f62ccf68cf3f5.zip | |
Get checkwps working again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19880 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/wps_parser.c | 15 | ||||
| -rw-r--r-- | apps/recorder/bmp.c | 3 |
2 files changed, 5 insertions, 13 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index acf161b6bb..0cc3ced06a 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -22,7 +22,6 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include "gwps.h" #include "file.h" #include "misc.h" #include "plugin.h" @@ -32,30 +31,24 @@ #include "proxy.h" #include "settings.h" #include "sysfont.h" -#include "gwps.h" -#include "font.h" -#include "bmp.h" -#include "backdrop.h" -#include "ctype.h" #else #include "checkwps.h" -#define SYSFONT_HEIGHT 8 +#include "audio.h" #define DEBUGF printf #endif /*WPSEDITOR*/ -#define FONT_SYSFIXED 0 -#define FONT_UI 1 #else #include "debug.h" #endif /*__PCTOOL__*/ -#ifndef __PCTOOL__ #include <ctype.h> #include <stdbool.h> #include <string.h> #include "font.h" #include "gwps.h" +#ifndef __PCTOOL__ #include "settings.h" +#endif #include "settings_list.h" #ifdef HAVE_LCD_BITMAP @@ -64,8 +57,6 @@ #include "backdrop.h" -#endif - #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps" #define RWPS_DEFAULTCFG WPS_DIR "/rockbox_default.rwps" diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index d6d836a6c5..3fb8a4d6c1 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c @@ -47,6 +47,7 @@ #endif #include "lcd.h" #include "file.h" +#include "bmp.h" #ifdef HAVE_REMOTE_LCD #include "lcd-remote.h" #endif @@ -58,9 +59,9 @@ #ifndef __PCTOOL__ #include "config.h" #include "system.h" -#include "bmp.h" #include "resize.h" #else +#include "checkwps.h" #undef DEBUGF #define DEBUGF(...) #endif |