summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorFelix Arends <edx@rockbox.org>2002-09-21 21:13:57 +0000
committerFelix Arends <edx@rockbox.org>2002-09-21 21:13:57 +0000
commit3531717c191c6fe7a0dcb3938ef8a67f82d86785 (patch)
tree33f1041563afeedd441eb65be27645969965dd50 /firmware
parent2d33e90e874570f593e83d150f270ec6d5a96727 (diff)
downloadrockbox-3531717c191c6fe7a0dcb3938ef8a67f82d86785.tar.gz
rockbox-3531717c191c6fe7a0dcb3938ef8a67f82d86785.zip
updated makefile with fonts and .lang support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2365 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/win32.mak14
1 files changed, 12 insertions, 2 deletions
diff --git a/firmware/win32.mak b/firmware/win32.mak
index 18615612cf..1cb6ccd784 100644
--- a/firmware/win32.mak
+++ b/firmware/win32.mak
@@ -12,6 +12,7 @@ LD = sh-elf-ld
AR = sh-elf-ar
AS = sh-elf-as
OC = sh-elf-objcopy
+TOOLSDIR = ../tools
INCLUDES=-Iinclude -I. -Icommon -Idrivers
@@ -51,6 +52,12 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(OBJDIR)/crt0.o $(OBJDIR)/bitswap.o
DEPS:=.deps
DEPDIRS:=$(DEPS) $(DEPS)/drivers $(DEPS)/common $(DEPS)/malloc
+ifndef PLAYER
+ifndef PLAYER_OLD
+ OBJS += $(OBJDIR)/sysfont.o
+endif
+endif
+
OUTPUT = $(OBJDIR)/librockbox.a
$(OUTPUT): $(OBJS)
@@ -62,9 +69,12 @@ $(OBJDIR)/%.o: %.c
$(OBJDIR)/%.o: %.S
$(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)/sysfont.o: fonts/clR6x8.bdf
+ $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
+ $(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@
+
clean:
- rm -f $(OBJS) $(OUTPUT)
- rm -rf $(OBJDIR)/$(DEPS)
+ -rm -f $(OBJS) $(OUTPUT) sysfont.c
# Special targets
$(OBJDIR)/thread.o: thread.c thread.h