devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#11470 - new skin code, finally svn uses the new parser from the theme editor. This means that a skin that passes the editor WILL pass svn and checkwps (unless the target runs out of skin buffer or something.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27613 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-07-29 12:37:48 +00:00
parent e436483b66
commit 2d31d77a8b
44 changed files with 2105 additions and 3326 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/checkwps/SOURCES
View file

@ -1,7 +1,6 @@
../../apps/gui/skin_engine/wps_debug.c
../../apps/gui/skin_engine/skin_parser.c
../../apps/gui/skin_engine/skin_backdrops.c
../../apps/gui/skin_engine/skin_buffer.c
#ifdef HAVE_LCD_BITMAP
../../apps/gui/skin_engine/skin_fonts.c
#endif

15
tools/checkwps/checkwps.c
View file

@ -26,6 +26,8 @@
#include "checkwps.h"
#include "resize.h"
#include "wps.h"
#include "skin_buffer.h"
#include "skin_debug.h"
#include "skin_engine.h"
#include "wps_internals.h"
#include "settings.h"
@ -237,6 +239,8 @@ int main(int argc, char **argv)
struct wps_data wps;
enum screen_type screen = SCREEN_MAIN;
struct screen* wps_screen;
char* buffer = NULL;
/* No arguments -> print the help text
* Also print the help text upon -h or --help */
@ -261,13 +265,19 @@ int main(int argc, char **argv)
wps_verbose_level++;
}
}
buffer = malloc(SKIN_BUFFER_SIZE);
if (!buffer)
{
printf("mallloc fail!\n");
return 1;
}
skin_buffer_init();
skin_buffer_init(buffer, SKIN_BUFFER_SIZE);
#ifdef HAVE_LCD_BITMAP
skin_font_init();
#endif
/* Go through every wps that was thrown at us, error out at the first
/* Go through every skin that was thrown at us, error out at the first
* flawed wps */
while (argv[filearg]) {
printf("Checking %s...\n", argv[filearg]);
@ -285,6 +295,7 @@ int main(int argc, char **argv)
if (!res) {
printf("WPS parsing failure\n");
skin_error_format_message();
return 3;
}

4
tools/checkwps/checkwps.make
View file

@ -26,6 +26,6 @@ GCCOPTS+=-D__PCTOOL__
.SECONDEXPANSION: # $$(OBJ) is not populated until after this
$(BUILDDIR)/$(BINARY): $$(OBJ)
$(BUILDDIR)/$(BINARY): $$(OBJ) $$(SKINLIB)
@echo LD $(BINARY)
$(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -o $@ $+
$(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -L$(BUILDDIR)/lib -lskin_parser -o $@ $+

4
tools/root.make
View file

@ -70,6 +70,7 @@ else ifneq (,$(findstring bootbox,$(APPSDIR)))
include $(APPSDIR)/bootbox.make
else ifneq (,$(findstring checkwps,$(APPSDIR)))
include $(APPSDIR)/checkwps.make
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
else ifneq (,$(findstring database,$(APPSDIR)))
include $(APPSDIR)/database.make
else
@ -170,7 +171,8 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(L
$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
$(VOICESPEEXLIB) $(FIRMLIB) -lgcc $(GLOBAL_LDOPTS) \
-L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map
-L$(BUILDDIR)/lib -lskin_parser \
-L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map
$(BUILDDIR)/rockbox.bin : $(BUILDDIR)/rockbox.elf
$(call PRINTS,OC $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@