diff options
author | Jens Arnold <amiconn@rockbox.org> | 2008-09-24 21:29:18 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2008-09-24 21:29:18 +0000 |
commit | 21893dcada8474042a4e69dcb89a8ba859f38277 (patch) | |
tree | 96fd4fe2a87349cda5ff32d668182bfc4e4b1e9f | |
parent | 9fd4f872c2500fa4b3fd0677bbfe1f9481c523f3 (diff) | |
download | rockbox-21893dcada8474042a4e69dcb89a8ba859f38277.tar.gz rockbox-21893dcada8474042a4e69dcb89a8ba859f38277.zip |
Limit the buil-in font to ASCII for bootloaders.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18636 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 072d7d54e0..9c5299ac03 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -12,6 +12,13 @@ INCLUDES=$(TARGET_INC) -Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BU | |||
12 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(EXTRA_DEFINES) \ |
13 | -DMEM=${MEMORYSIZE} | 13 | -DMEM=${MEMORYSIZE} |
14 | 14 | ||
15 | # Limits for the built-in sysfont: ASCII for bootloaders, ISO8859-1 for normal builds | ||
16 | ifneq (,$(findstring -DBOOTLOADER,$(EXTRA_DEFINES))) | ||
17 | MAXCHAR = 127 | ||
18 | else | ||
19 | MAXCHAR = 255 | ||
20 | endif | ||
21 | |||
15 | # This sets up 'SRC' based on the files mentioned in SOURCES | 22 | # This sets up 'SRC' based on the files mentioned in SOURCES |
16 | include $(TOOLSDIR)/makesrc.inc | 23 | include $(TOOLSDIR)/makesrc.inc |
17 | 24 | ||
@@ -43,10 +50,10 @@ $(OBJDIR)/thread.o: thread.c export/thread.h | |||
43 | $(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ | 50 | $(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ |
44 | 51 | ||
45 | $(BUILDDIR)/sysfont.h: ../fonts/08-Schumacher-Clean.bdf | 52 | $(BUILDDIR)/sysfont.h: ../fonts/08-Schumacher-Clean.bdf |
46 | $(call PRINTS,Create sysfont.h)$(TOOLSDIR)/convbdf -l 255 -h -o $@ $< | 53 | $(call PRINTS,Create sysfont.h)$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $< |
47 | 54 | ||
48 | $(OBJDIR)/sysfont.o: ../fonts/08-Schumacher-Clean.bdf | 55 | $(OBJDIR)/sysfont.o: ../fonts/08-Schumacher-Clean.bdf |
49 | $(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -l 255 -c -o $(OBJDIR)/sysfont.c $< | 56 | $(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(OBJDIR)/sysfont.c $< |
50 | $(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | 57 | $(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ |
51 | 58 | ||
52 | -include $(DEPFILE) | 59 | -include $(DEPFILE) |