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

diff --git a/betty/Makefile b/betty/Makefile
index 0af33ac..3807986 100644
--- a/betty/Makefile
+++ b/betty/Makefile
@@ -15,11 +15,24 @@ 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 bmp2b
 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 += pffs.o
+
 # all projects
-all: $(HOST_TARGET) $(CROSS_TARGET)
+all: links $(HOST_TARGET) $(CROSS_TARGET)
+
+# bmp2b
+links:
+	ln -sfv ../../api/bmp/bmp.{c,h} .
+
+bmp.o: bmp.c
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+bmp2b: bmp.o
 
 # arm code
 arm: arm_clean $(CROSS_TARGET)
@@ -36,9 +49,10 @@ arm: arm_clean $(CROSS_TARGET)
 %.elf: %.o startup.o
 	$(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.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 +60,7 @@ betty.elf: betty.o startup.o
 
 # host clean
 clean:
-	rm -f lpcload fwdump
+	rm -vf lpcload fwdump
 
 # arm clean
 arm_clean: