summaryrefslogtreecommitdiff
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
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
-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
12AR = sh-elf-ar 12AR = sh-elf-ar
13AS = sh-elf-as 13AS = sh-elf-as
14OC = sh-elf-objcopy 14OC = sh-elf-objcopy
15TOOLSDIR = ../tools
15 16
16INCLUDES=-Iinclude -I. -Icommon -Idrivers 17INCLUDES=-Iinclude -I. -Icommon -Idrivers
17 18
@@ -51,6 +52,12 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(OBJDIR)/crt0.o $(OBJDIR)/bitswap.o
51DEPS:=.deps 52DEPS:=.deps
52DEPDIRS:=$(DEPS) $(DEPS)/drivers $(DEPS)/common $(DEPS)/malloc 53DEPDIRS:=$(DEPS) $(DEPS)/drivers $(DEPS)/common $(DEPS)/malloc
53 54
55ifndef PLAYER
56ifndef PLAYER_OLD
57 OBJS += $(OBJDIR)/sysfont.o
58endif
59endif
60
54OUTPUT = $(OBJDIR)/librockbox.a 61OUTPUT = $(OBJDIR)/librockbox.a
55 62
56$(OUTPUT): $(OBJS) 63$(OUTPUT): $(OBJS)
@@ -62,9 +69,12 @@ $(OBJDIR)/%.o: %.c
62$(OBJDIR)/%.o: %.S 69$(OBJDIR)/%.o: %.S
63 $(CC) $(CFLAGS) -c $< -o $@ 70 $(CC) $(CFLAGS) -c $< -o $@
64 71
72$(OBJDIR)/sysfont.o: fonts/clR6x8.bdf
73 $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
74 $(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@
75
65clean: 76clean:
66 rm -f $(OBJS) $(OUTPUT) 77 -rm -f $(OBJS) $(OUTPUT) sysfont.c
67 rm -rf $(OBJDIR)/$(DEPS)
68 78
69# Special targets 79# Special targets
70$(OBJDIR)/thread.o: thread.c thread.h 80$(OBJDIR)/thread.o: thread.c thread.h