From f4709d0c7c160fa594ca9289c9a28352f1d44126 Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Wed, 17 Jan 2007 12:20:38 +0000 Subject: 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 --- firmware/Makefile | 3 +++ firmware/export/font.h | 1 + 2 files changed, 4 insertions(+) (limited to 'firmware') diff --git a/firmware/Makefile b/firmware/Makefile index dea4c81b33..55c8269b24 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -40,6 +40,9 @@ clean: $(OBJDIR)/thread.o: thread.c export/thread.h $(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ +sysfont.h: ../fonts/rockbox_default.bdf + $(call PRINTS,Create sysfont.h)$(TOOLSDIR)/convbdf -h -o $(BUILDDIR)/sysfont.h $< + $(OBJDIR)/sysfont.o: ../fonts/rockbox_default.bdf $(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< $(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 @@ * Incore font and image definitions */ #include "config.h" +#include "sysfont.h" #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) -- cgit v1.2.3