summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-02-24 05:58:16 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-02-24 05:58:16 +0000
commit0acb38b61c068bc34ddfea20e88a63dc3bcec3a1 (patch)
tree90ea2104ca18bc725ea6bd9cf47e448d6f46b034
parent14f066dc2541f4f7242fca1e67f4f2928504cee2 (diff)
downloadrockbox-0acb38b61c068bc34ddfea20e88a63dc3bcec3a1.tar.gz
rockbox-0acb38b61c068bc34ddfea20e88a63dc3bcec3a1.tar.bz2
rockbox-0acb38b61c068bc34ddfea20e88a63dc3bcec3a1.zip
some minor changes to checkwps, shouldn't change anything
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24874 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_parser.c4
-rw-r--r--apps/settings.h2
-rw-r--r--tools/checkwps/checkwps.c2
-rw-r--r--tools/checkwps/checkwps.make2
4 files changed, 6 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 7f4406a0bf..f7808b31ad 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1926,7 +1926,10 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug)
#if defined(DEBUG) || defined(SIMULATOR)
if (debug)
+ {
print_debug_info(data, fail, line_number);
+ debug_skin_usage();
+ }
#else
(void)debug;
#endif
@@ -2175,7 +2178,6 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
char *dot = strrchr(buf, '.');
strlcpy(bmpdir, buf, dot - buf + 1);
-
/* load the bitmaps that were found by the parsing */
if (!load_skin_bitmaps(wps_data, bmpdir)) {
skin_data_reset(wps_data);
diff --git a/apps/settings.h b/apps/settings.h
index 6a42ca3c0c..7c40c09908 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -55,7 +55,7 @@ struct opt_items {
#error ROCKBOX_DIR not defined (should be in autoconf.h)
#endif
#define ROCKBOX_DIR_LEN sizeof(ROCKBOX_DIR)
-#endif
+#endif /* def __PCTOOL__ */
#define FONT_DIR ROCKBOX_DIR "/fonts"
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index bb0af5298f..32d7ef16fd 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -170,7 +170,7 @@ void* plugin_get_buffer(size_t *buffer_size)
}
struct user_settings global_settings = {
- .statusbar = true,
+ .statusbar = STATUSBAR_TOP,
#ifdef HAVE_LCD_COLOR
.bg_color = LCD_DEFAULT_BG,
.fg_color = LCD_DEFAULT_FG,
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index 13fef935dd..4f6a774bfd 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -7,7 +7,7 @@
# $Id$
#
-FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) -Wall
+FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall
SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES)