diff options
| author | Barry Wardell <rockbox@barrywardell.net> | 2007-01-17 12:20:38 +0000 |
|---|---|---|
| committer | Barry Wardell <rockbox@barrywardell.net> | 2007-01-17 12:20:38 +0000 |
| commit | f4709d0c7c160fa594ca9289c9a28352f1d44126 (patch) | |
| tree | 717b3d2d4959268f56c87692fd5021f3e9be3e73 /firmware | |
| parent | b0d1bb891ec91994f7cd453e09dd38a5539e16d6 (diff) | |
| download | rockbox-f4709d0c7c160fa594ca9289c9a28352f1d44126.tar.gz rockbox-f4709d0c7c160fa594ca9289c9a28352f1d44126.zip | |
Make the build system create a sysfont.h which includes font information for the system font. Available #defines are: SYSFONT_NAME, SYSFONT_FACENAME, SYSFONT_WIDTH, SYSFONT_HEIGHT, SYSFONT_SIZE, SYSFONT_ASCENT, SYSFONT_DESCENT, SYSFONT_FIRST_CHAR, SYSFONT_LAST_CHAR, SYSFONT_DEFAULT_CHAR, SYSFONT_PROPORTIONAL, SYSFONT_COPYRIGHT, SYSFONT_BITS_SIZE.
Also fix a small bug in the iPod bootloader printf() code and use printf() for PortalPlayer bootloaders too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12041 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/Makefile | 3 | ||||
| -rw-r--r-- | firmware/export/font.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index dea4c81b33..55c8269b24 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -40,6 +40,9 @@ clean: | |||
| 40 | $(OBJDIR)/thread.o: thread.c export/thread.h | 40 | $(OBJDIR)/thread.o: thread.c export/thread.h |
| 41 | $(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ | 41 | $(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ |
| 42 | 42 | ||
| 43 | sysfont.h: ../fonts/rockbox_default.bdf | ||
| 44 | $(call PRINTS,Create sysfont.h)$(TOOLSDIR)/convbdf -h -o $(BUILDDIR)/sysfont.h $< | ||
| 45 | |||
| 43 | $(OBJDIR)/sysfont.o: ../fonts/rockbox_default.bdf | 46 | $(OBJDIR)/sysfont.o: ../fonts/rockbox_default.bdf |
| 44 | $(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< | 47 | $(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< |
| 45 | $(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | 48 | $(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ |
diff --git a/firmware/export/font.h b/firmware/export/font.h index ccdb30ff00..3cf60aeac3 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * Incore font and image definitions | 23 | * Incore font and image definitions |
| 24 | */ | 24 | */ |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #include "sysfont.h" | ||
| 26 | 27 | ||
| 27 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) | 28 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) |
| 28 | 29 | ||