X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=betty%2FMakefile;h=f6d465f5a703741b2cebbacee878245437ee4ee3;hb=362d5c63842bf9e3a16de41515f5b76e867d6452;hp=54f1d34b60df3feadbe7140a3ba3d56f42b7a773;hpb=60432148802391c2ba390e9c56f999514653c969;p=my-code%2Farm.git

diff --git a/betty/Makefile b/betty/Makefile
index 54f1d34..f6d465f 100644
--- 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 = buttons.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