From bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7 Mon Sep 17 00:00:00 2001
From: Björn Stenberg <bjorn@haxx.se>
Date: Fri, 20 Sep 2002 08:07:51 +0000
Subject: New full ISO-8859-1 system font. Added font loading from dir browser.
 Changed default font location to /.rockbox/default.fnt. Code-policed font
 code. Removed old font tools.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2347 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'firmware/Makefile')

diff --git a/firmware/Makefile b/firmware/Makefile
index 24f5b46614..a5ce323be9 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -19,6 +19,7 @@ SYSTEM_FONT = fonts/alt6x10.bdf
 
 # store output files in this directory:
 OBJDIR = .
+TOOLSDIR = ../tools
 
 CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES)
 
@@ -38,9 +39,8 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS))
 
 OUTPUT = $(OBJDIR)/librockbox.a
 
-
-ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
-	EXTRA_TARGETS = $(OBJDIR)/system.ajf
+ifeq (RECORDER,$(findstring RECORDER, $(CFLAGS)))
+	OBJS +=	$(OBJDIR)/sysfont.o
 endif
 
 all: $(OUTPUT) $(EXTRA_TARGETS)
@@ -70,6 +70,10 @@ clean:
 $(OBJDIR)/thread.o: thread.c thread.h
 	$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@
 
+$(OBJDIR)/sysfont.o: fonts/clR6x8.bdf
+	$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
+	$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@
+
 $(OBJDIR)/$(DEPS)/%.d: %.c
 	@$(SHELL) -c 'for d in $(DEPDIRS); do { if [ ! -d $(OBJDIR)/$$d ]; then mkdir $(OBJDIR)/$$d; fi; }; done'
 	@echo "Updating dependencies for $<"
-- 
cgit v1.2.3