added font2b code to convert linux console fonts to lcd ram layout

[my-code/arm.git] / betty / Makefile

diff --git a/betty/Makefile b/betty/Makefile
index f740401..f6d465f 100644 (file)
--- a/betty/Makefile
+++ b/betty/Makefile
@@ -1,6 +1,6 @@
 # native builds
 CC = gcc
-CFLAGS = -Wall
+CFLAGS = -Wall -I/usr/src/linux/include
 
 # cross build
 ARCH = arm-elf
@@ -15,15 +15,27 @@ CROSS_RAM_LDFLAGS = -Tlpc2220_ram.ld -nostartfiles -nostdlib
 CROSS_ROM_LDFLAGS = -Tlpc2220_rom.ld -nostartfiles -nostdlib
 
 # build objects
-HOST_TARGET = lpcload fwdump
+HOST_TARGET = lpcload fwdump font2b
 CROSS_TARGET = fwbc.hex fwflash.hex betty.hex
 
 # betty deps
-BETTY_DEPS = system.o uart.o buttons.o spi.o display.o
+BETTY_DEPS = system.o uart.o buttons.o spi.o display.o flash.o functions.o
+#BETTY_DEPS += pffs.o
 
 # all projects
 all: $(HOST_TARGET) $(CROSS_TARGET)
 
+# bmp2b / font2b
+links:
+       ln -sfv ../../api/bmp/bmp.{c,h} .
+
+bmp.c: links
+
+bmp.o: bmp.c
+       $(CC) -c $(CFLAGS) -o $@ $<
+
+bmp2b: bmp.o
+
 # arm code
 arm: arm_clean $(CROSS_TARGET)
 
@@ -41,7 +53,7 @@ arm: arm_clean $(CROSS_TARGET)
 
 # betty is special ;)
 betty.elf: betty.o startup.o $(BETTY_DEPS)
-       #$(CROSS_LD) $(CROSS_ROM_LDFLAGS) startup.o -o $@ $<
+       #$(CROSS_LD) $(CROSS_ROM_LDFLAGS) startup.o $(BETTY_DEPS) -o $@ $<
        $(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o $(BETTY_DEPS) -o $@ $<
 
 # .hex out of .elf