X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2FMakefile;h=4d2a1aa44450803513cd65d6596c7ff0a146d1bd;hp=0af33acaa0f98a8e698c9ee1cd58dc35c8dc8854;hb=202c5cb4442b81aa5d0f7389b6dca62b2c121ac1;hpb=2cbc6d2f18a38237fcd1df2ef67ba315af080f03

diff --git a/betty/Makefile b/betty/Makefile
index 0af33ac..4d2a1aa 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
@@ -11,16 +11,31 @@ CROSS_OBJCOPY = $(ARCH)-objcopy
 CROSS_OPTS = -mcpu=arm7tdmi-s
 CROSS_CFLAGS = $(CROSS_OPTS) -Wall -Os
 CROSS_ASLAGS = $(CROSS_OPTS) --gstabs
-CROSS_RAM_LDFLAGS = -Tlpc2220_ram.ld -nostartfiles -nostdlib
+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 flash.o functions.o
+BETTY_DEPS += interrupts.o #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)
 
@@ -33,12 +48,13 @@ arm: arm_clean $(CROSS_TARGET)
 	$(CROSS_AS) $(CROSS_ASLAGS) -o $@ $<
 
 # .elf out of .o
-%.elf: %.o startup.o
-	$(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o -o $@ $<
+%.elf: %.o startup.o interrupts.o
+	$(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o interrupts.o -o $@ $<
 
-# special linker case ...
-betty.elf: betty.o startup.o
-	$(CROSS_LD) $(CROSS_ROM_LDFLAGS) startup.o -o $@ $<
+# betty is special ;)
+betty.elf: betty.o startup.o $(BETTY_DEPS)
+	#$(CROSS_LD) $(CROSS_ROM_LDFLAGS) startup.o $(BETTY_DEPS) -o $@ $<
+	$(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o $(BETTY_DEPS) -o $@ $<
 
 # .hex out of .elf
 %.hex: %.elf
@@ -46,7 +62,7 @@ betty.elf: betty.o startup.o
 
 # host clean
 clean:
-	rm -f lpcload fwdump
+	rm -vf lpcload fwdump
 
 # arm clean
 arm_clean: