len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings. convbdf needed to be updated for the changed font struct because it generates sysfont.c.

Browse source 
Change-Id: Id5aea6b6c73438242a80ae6849ee5e29ab8659dc
This commit is contained in:
Thomas Martitz 2014-01-26 15:02:11 +01:00
parent 37be80a1a5
commit 77ee2851de
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/firmware.make
View file

@ -38,7 +38,7 @@ $(FIRMLIB): $(FIRMLIB_OBJ)
$(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
$(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS)
$(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) $(BUILDDIR)/firmware/common/config.o
$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $<
$(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h

3
tools/convbdf.c
View file

@ -1211,6 +1211,8 @@ int gen_c_source(struct font* pf, char *path)
char obuf[256];
char hdr1[] = {
"/* Generated by convbdf on %s. */\n"
"#include <stdbool.h>\n"
"#include \"config.h\"\n"
"#include \"font.h\"\n"
"#ifdef HAVE_LCD_BITMAP\n"
"\n"
@ -1418,6 +1420,7 @@ int gen_c_source(struct font* pf, char *path)
" 0, /* ^ position */\n"
" 0, /* ^ end */\n"
" 0, /* ^ size */\n"
" false, /* disabled */\n"
" {{0,0,0,0,0},0,0,0,0,0}, /* cache */\n"
" 0, /* */\n"
" 0, /* */\n"