X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2FMakefile.defs;h=0710d74774ec4e18c4e8fba3df9db52ba342a14e;hb=6aa99c160f0695eb25ccc0598e4c36224c89dab4;hp=8ef30521ee4645e63a60afc531ea5841d0abeaf8;hpb=1bffe8caf0294e9cfef2dab1c6b5a8d1d87ac3a2;p=fw%2Faltos

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 8ef30521..0710d747 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,4 +1,4 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:..
+vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:../math:..
 vpath make-altitude ../util
 vpath make-kalman ../util
 vpath kalman.5c ../kalman
@@ -12,17 +12,20 @@ vpath ao-make-product.5c ../util
 .elf.ihx:
 	objcopy -O ihex $*.elf $@
 
-SAT=/opt/cortex
-CC=$(SAT)/bin/arm-none-eabi-gcc
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
-SAT_CFLAGS=-I$(SAT)/include
+ifndef TOPDIR
+TOPDIR=..
+endif
 
 ifndef VERSION
-include ../Version
+include $(TOPDIR)/Version
 endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+LIBS=-lpdclib-cortex-m3 -lgcc
 
-AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
+AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I../math -I..
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
 
 LDFLAGS=-L../stm -Wl,-Taltos.ld