diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-09-20 08:07:51 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-09-20 08:07:51 +0000 |
| commit | bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7 (patch) | |
| tree | 59ef1faa129f0813071d5e81b2e55b5d04886202 /firmware/Makefile | |
| parent | eb5cc653dba373f2d2ce48f8efbc0b19a424971e (diff) | |
| download | rockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.tar.gz rockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.zip | |
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
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
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 | |||
| 19 | 19 | ||
| 20 | # store output files in this directory: | 20 | # store output files in this directory: |
| 21 | OBJDIR = . | 21 | OBJDIR = . |
| 22 | TOOLSDIR = ../tools | ||
| 22 | 23 | ||
| 23 | CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) | 24 | CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) |
| 24 | 25 | ||
| @@ -38,9 +39,8 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS)) | |||
| 38 | 39 | ||
| 39 | OUTPUT = $(OBJDIR)/librockbox.a | 40 | OUTPUT = $(OBJDIR)/librockbox.a |
| 40 | 41 | ||
| 41 | 42 | ifeq (RECORDER,$(findstring RECORDER, $(CFLAGS))) | |
| 42 | ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS))) | 43 | OBJS += $(OBJDIR)/sysfont.o |
| 43 | EXTRA_TARGETS = $(OBJDIR)/system.ajf | ||
| 44 | endif | 44 | endif |
| 45 | 45 | ||
| 46 | all: $(OUTPUT) $(EXTRA_TARGETS) | 46 | all: $(OUTPUT) $(EXTRA_TARGETS) |
| @@ -70,6 +70,10 @@ clean: | |||
| 70 | $(OBJDIR)/thread.o: thread.c thread.h | 70 | $(OBJDIR)/thread.o: thread.c thread.h |
| 71 | $(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ | 71 | $(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ |
| 72 | 72 | ||
| 73 | $(OBJDIR)/sysfont.o: fonts/clR6x8.bdf | ||
| 74 | $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< | ||
| 75 | $(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | ||
| 76 | |||
| 73 | $(OBJDIR)/$(DEPS)/%.d: %.c | 77 | $(OBJDIR)/$(DEPS)/%.d: %.c |
| 74 | @$(SHELL) -c 'for d in $(DEPDIRS); do { if [ ! -d $(OBJDIR)/$$d ]; then mkdir $(OBJDIR)/$$d; fi; }; done' | 78 | @$(SHELL) -c 'for d in $(DEPDIRS); do { if [ ! -d $(OBJDIR)/$$d ]; then mkdir $(OBJDIR)/$$d; fi; }; done' |
| 75 | @echo "Updating dependencies for $<" | 79 | @echo "Updating dependencies for $<" |