X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcortexelf-v1%2FMakefile;h=63619b7a9e55532b5e22cdf19ff8ec11117da255;hp=a645d222fe5e477bd8ce20679974c689c5898161;hb=HEAD;hpb=bc150497de8539827177805c7f4430c67ca6762f

diff --git a/src/cortexelf-v1/Makefile b/src/cortexelf-v1/Makefile
index a645d222..63619b7a 100644
--- a/src/cortexelf-v1/Makefile
+++ b/src/cortexelf-v1/Makefile
@@ -4,6 +4,8 @@
 #
 
 include ../stm/Makefile.defs
+include ../scheme/Makefile-inc
+
 
 INC = \
 	ao.h \
@@ -15,39 +17,24 @@ INC = \
 	ao_product.h \
 	ao_profile.h \
 	ao_task.h \
-	ao_whiten.h \
-	ao_quaternion.h \
 	math.h \
 	ao_mpu.h \
 	stm32l.h \
-	math.h \
+	ao_vga.h \
+	ao_draw.h \
+	ao_draw_int.h \
+	ao_font.h \
+	ao_ps2.h \
+	$(SCHEME_HDRS) \
+	ao_flip_bits.h \
 	Makefile
 
-#
-# Common AltOS sources
-#
-#	ao_hmc5883.c
-
 #PROFILE=ao_profile.c
 #PROFILE_DEF=-DAO_PROFILE=1
 
 #STACK_GUARD=ao_mpu_stm.c
 #STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
 
-MATH_SRC=\
-	ef_acos.c \
-	ef_sqrt.c \
-	ef_rem_pio2.c \
-	kf_cos.c \
-	kf_sin.c \
-	kf_rem_pio2.c \
-	sf_copysign.c \
-	sf_cos.c \
-	sf_fabs.c \
-	sf_floor.c \
-	sf_scalbn.c \
-	sf_sin.c \
-	ef_log.c
 
 ALTOS_SRC = \
 	ao_boot_chain.c \
@@ -57,23 +44,37 @@ ALTOS_SRC = \
 	ao_cmd.c \
 	ao_config.c \
 	ao_task.c \
-	ao_led.c \
+	ao_errno.c \
 	ao_stdio.c \
 	ao_panic.c \
 	ao_timer.c \
 	ao_mutex.c \
 	ao_serial_stm.c \
-	ao_ignite.c \
-	ao_freq.c \
 	ao_dma_stm.c \
 	ao_spi_stm.c \
-	ao_storage.c \
-	ao_m25.c \
 	ao_usb_stm.c \
 	ao_exti_stm.c \
 	ao_i2c_stm.c \
-	ao_convert_volt.c \
-	$(MATH_SRC) \
+	ao_as1107.c \
+	ao_matrix.c \
+	ao_vga.c \
+	ao_blt.c \
+	ao_copy.c \
+	ao_rect.c \
+	ao_text.c \
+	ao_line.c \
+	ao_ps2.c \
+	ao_console.c \
+	ao_sdcard.c \
+	ao_bufio.c \
+	ao_fat.c \
+	ao_flash_stm.c \
+	ao_button.c \
+	ao_event.c \
+	ao_1802.c \
+	ao_hex.c \
+	$(SCHEME_SRCS) \
+	ao_scheme_os_save.c \
 	$(PROFILE) \
 	$(SAMPLE_PROFILE) \
 	$(STACK_GUARD)
@@ -82,18 +83,27 @@ PRODUCT=CortexELF-v1
 PRODUCT_DEF=-DCORTEXELF
 IDPRODUCT=0x000a
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g
-
 PROGNAME=cortexelf-v1
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
 
+MAP=$(PROG).map
+
+MAPFILE=-Wl,-M=$(MAP)
+
+LDFLAGS=-L../stm -L/local/newlib-mini/arm-none-eabi/lib/thumb/v7-m/ -Wl,-Tcortexelf.ld $(MAPFILE) -nostartfiles
+AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../draw -I../scheme -I.. -I/local/newlib-mini/arm-none-eabi/include
+LIBS=-lc -lm -lgcc
+
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF)
+
+
 SRC=$(ALTOS_SRC) ao_cortexelf.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all:: $(PROG) $(HEX)
 
-$(PROG): Makefile $(OBJ) altos.ld
+$(PROG): Makefile $(OBJ) cortexelf.ld
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude-pa.h: make-altitude-pa
@@ -106,9 +116,14 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
+clean::
 	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
-	rm -f ao_product.h
+	rm -f ao_product.h ao_flip_bits.h
+
+ao_flip_bits.h: ao_flip_bits.5c
+	nickle ao_flip_bits.5c > $@
+
+include ../scheme/Makefile-scheme
 
 install: