diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-08-31 13:31:00 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-08-31 13:32:24 -0400 |
| commit | 56b49b3074f4ad9b6774f7be81b35772733b15a0 (patch) | |
| tree | ed50ca13d19f8ebd5a32679b05b025fc4dbf9ff2 /firmware | |
| parent | 790a5bb0ca464c7ed1e0f1b058bb1ac30a8a055c (diff) | |
| download | rockbox-56b49b3074f4ad9b6774f7be81b35772733b15a0.tar.gz rockbox-56b49b3074f4ad9b6774f7be81b35772733b15a0.tar.bz2 rockbox-56b49b3074f4ad9b6774f7be81b35772733b15a0.zip | |
fonts: Use '08-Rockfont' as FONT_SYSFIXED on targets with 128x64 screens
..It's already the default UI font on those targets
Change-Id: If8cb44da650d19882e4bd4b641af2f4fa59c1cd1
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/firmware.make | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/firmware/firmware.make b/firmware/firmware.make index 50b58af794..e2babca594 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make @@ -22,7 +22,10 @@ OTHER_SRC += $(FIRMLIB_SRC) FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a -SYSFONT = $(ROOTDIR)/fonts/08-Schumacher-Clean.bdf +ifeq ($(SYSFONT),) +SYSFONT = 08-Schumacher-Clean +endif +SYSFONTX = $(ROOTDIR)/fonts/$(SYSFONT).bdf CLEANOBJS += $(BUILDDIR)/sysfont.* $(BUILDDIR)/version.* @@ -37,10 +40,10 @@ $(FIRMLIB): $(FIRMLIB_OBJ) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -$(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) $(BUILDDIR)/firmware/common/config.o +$(BUILDDIR)/sysfont.h: $(SYSFONTX) $(TOOLS) $(BUILDDIR)/firmware/common/config.o $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $< -$(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h +$(BUILDDIR)/sysfont.o: $(SYSFONTX) $(BUILDDIR)/sysfont.h $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $< $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ |