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

diff --git a/betty/Makefile b/betty/Makefile
index 3807986..a76cf32 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,24 +11,26 @@ 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 bmp2b
+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 += pffs.o
+BETTY_DEPS += interrupts.o pwm.o #pffs.o
 
 # all projects
-all: links $(HOST_TARGET) $(CROSS_TARGET)
+all: $(HOST_TARGET) $(CROSS_TARGET)
 
-# bmp2b
+# bmp2b / font2b
 links:
 	ln -sfv ../../api/bmp/bmp.{c,h} .
 
+bmp.c: links
+
 bmp.o: bmp.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
@@ -46,8 +48,8 @@ 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 $@ $<
 
 # betty is special ;)
 betty.elf: betty.o startup.o $(BETTY_DEPS)