summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2009-09-11 17:58:17 +0000
committerFrank Gevaerts <frank@gevaerts.be>2009-09-11 17:58:17 +0000
commitc8020748bbac366d3f9bfb4552c1c6641827c7eb (patch)
treef8c4bc1ba2d174381692c5cff552e8896714396c /tools
parent246e38e937ba3312e910973dedefd86ddc6622e9 (diff)
downloadrockbox-c8020748bbac366d3f9bfb4552c1c6641827c7eb.tar.gz
rockbox-c8020748bbac366d3f9bfb4552c1c6641827c7eb.tar.bz2
rockbox-c8020748bbac366d3f9bfb4552c1c6641827c7eb.zip
Fix checkwps compilation for the Player
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22680 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r--tools/checkwps/SOURCES10
-rw-r--r--tools/checkwps/checkwps.c4
-rw-r--r--tools/checkwps/checkwps.make8
-rwxr-xr-xtools/configure1
4 files changed, 16 insertions, 7 deletions
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES
new file mode 100644
index 0000000000..80b2f76510
--- /dev/null
+++ b/tools/checkwps/SOURCES
@@ -0,0 +1,10 @@
+../../apps/gui/skin_engine/wps_debug.c
+../../apps/gui/skin_engine/skin_parser.c
+../../apps/gui/skin_engine/skin_buffer.c
+../../apps/misc.c
+../../firmware/common/strlcpy.c
+checkwps.c
+
+#ifdef HAVE_LCD_BITMAP
+../../apps/recorder/bmp.c
+#endif
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 88ef179cb2..6e985195fb 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -348,9 +348,11 @@ const char* viewport_parse_viewport(struct viewport *vp,
#if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1)
if (depth == 1)
{
+#ifdef HAVE_LCD_BITMAP
if (!(ptr = parse_list("ddddd", &set, separator, ptr,
&vp->x, &vp->y, &vp->width, &vp->height, &vp->font)))
return NULL;
+#endif
}
else
#endif
@@ -397,6 +399,7 @@ const char* viewport_parse_viewport(struct viewport *vp,
return NULL;
}
+#ifdef HAVE_LCD_BITMAP
/* Default to using the user font if the font was an invalid number or '-'*/
if (((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))
|| !LIST_VALUE_PARSED(set, PL_FONT)
@@ -405,6 +408,7 @@ const char* viewport_parse_viewport(struct viewport *vp,
/* Set the defaults for fields not user-specified */
vp->drawmode = DRMODE_SOLID;
+#endif
return ptr;
}
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index 0a455e9770..22a1f07263 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -9,13 +9,7 @@
FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET)
-SRC = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \
- $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \
- $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \
- $(ROOTDIR)/apps/misc.c \
- $(ROOTDIR)/apps/recorder/bmp.c \
- $(ROOTDIR)/firmware/common/strlcpy.c \
- $(APPSDIR)/checkwps.c
+SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES)
INCLUDES = -I$(ROOTDIR)/apps/gui \
-I$(ROOTDIR)/apps/gui/skin_engine \
diff --git a/tools/configure b/tools/configure
index 3cbb77fedf..693113e19f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2519,6 +2519,7 @@ fi
GCCOPTS='';
appsdir='\$(ROOTDIR)/tools/checkwps';
output='checkwps.'${modelname};
+ archosrom='';
echo "CheckWPS build selected"
;;
*)