len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix checkwps compilation for the Player

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22680 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2009-09-11 17:58:17 +00:00
parent 246e38e937
commit c8020748bb
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/checkwps/SOURCES Normal file
View file

@ -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

4
tools/checkwps/checkwps.c
View file

@ -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 (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1)
if (depth == 1) if (depth == 1)
{ {
#ifdef HAVE_LCD_BITMAP
if (!(ptr = parse_list("ddddd", &set, separator, ptr, if (!(ptr = parse_list("ddddd", &set, separator, ptr,
&vp->x, &vp->y, &vp->width, &vp->height, &vp->font))) &vp->x, &vp->y, &vp->width, &vp->height, &vp->font)))
return NULL; return NULL;
#endif
} }
else else
#endif #endif
@ -397,6 +399,7 @@ const char* viewport_parse_viewport(struct viewport *vp,
return NULL; return NULL;
} }
#ifdef HAVE_LCD_BITMAP
/* Default to using the user font if the font was an invalid number or '-'*/ /* Default to using the user font if the font was an invalid number or '-'*/
if (((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI)) if (((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))
|| !LIST_VALUE_PARSED(set, PL_FONT) || !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 */ /* Set the defaults for fields not user-specified */
vp->drawmode = DRMODE_SOLID; vp->drawmode = DRMODE_SOLID;
#endif
return ptr; return ptr;
} }

8
tools/checkwps/checkwps.make
View file

@ -9,13 +9,7 @@
FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET)
SRC = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \ SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES)
$(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
INCLUDES = -I$(ROOTDIR)/apps/gui \ INCLUDES = -I$(ROOTDIR)/apps/gui \
-I$(ROOTDIR)/apps/gui/skin_engine \ -I$(ROOTDIR)/apps/gui/skin_engine \

1
tools/configure vendored
View file

@ -2519,6 +2519,7 @@ fi
GCCOPTS=''; GCCOPTS='';
appsdir='\$(ROOTDIR)/tools/checkwps'; appsdir='\$(ROOTDIR)/tools/checkwps';
output='checkwps.'${modelname}; output='checkwps.'${modelname};
archosrom='';
echo "CheckWPS build selected" echo "CheckWPS build selected"
;; ;;
*) *)