diff options
-rw-r--r-- | firmware/win32.mak | 14 |
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 | |||
12 | AR = sh-elf-ar | 12 | AR = sh-elf-ar |
13 | AS = sh-elf-as | 13 | AS = sh-elf-as |
14 | OC = sh-elf-objcopy | 14 | OC = sh-elf-objcopy |
15 | TOOLSDIR = ../tools | ||
15 | 16 | ||
16 | INCLUDES=-Iinclude -I. -Icommon -Idrivers | 17 | INCLUDES=-Iinclude -I. -Icommon -Idrivers |
17 | 18 | ||
@@ -51,6 +52,12 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(OBJDIR)/crt0.o $(OBJDIR)/bitswap.o | |||
51 | DEPS:=.deps | 52 | DEPS:=.deps |
52 | DEPDIRS:=$(DEPS) $(DEPS)/drivers $(DEPS)/common $(DEPS)/malloc | 53 | DEPDIRS:=$(DEPS) $(DEPS)/drivers $(DEPS)/common $(DEPS)/malloc |
53 | 54 | ||
55 | ifndef PLAYER | ||
56 | ifndef PLAYER_OLD | ||
57 | OBJS += $(OBJDIR)/sysfont.o | ||
58 | endif | ||
59 | endif | ||
60 | |||
54 | OUTPUT = $(OBJDIR)/librockbox.a | 61 | OUTPUT = $(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 | |||
65 | clean: | 76 | clean: |
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 |