From 869ed39e4c28ebb9813a8b28192d4ca92f72bf22 Mon Sep 17 00:00:00 2001 From: Perry Hung Date: Tue, 30 Mar 2010 22:50:18 -0400 Subject: Removed STM32 flash code, replaced with barebones hacks for now. At this point, there shouldn't be any STM code being compiled and linked against. There are still a bunch of STM header includes, though. --- Makefile | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bdc2bf1..5d462dc 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ OUTDIRS = $(BUILD_PATH)/$(STM_SRC) \ $(BUILD_PATH)/core/comm -INCLUDES = -Istm32lib/inc \ - -I$(LIB_PATH) \ +INCLUDES = -I$(LIB_PATH) \ + -Istm32lib/inc \ -I./ \ -Icore \ -Icore/comm @@ -61,30 +61,27 @@ ODFLAGS = -S # main source file MAIN=main.c -STM32SRCS = $(STM_SRC)/stm32f10x_flash.c \ - $(STM_SRC)/stm32f10x_nvic.c - -CSRC = libmaple/systick.c \ - libmaple/timers.c \ - libmaple/adc.c \ - libmaple/syscalls.c \ - libmaple/stm32f10x_it.c \ - libmaple/exti.c \ - libmaple/gpio.c \ - libmaple/nvic.c \ - libmaple/usart.c \ - libmaple/util.c \ - libmaple/usb.c \ - libmaple/rcc.c \ - core/wiring.c \ - core/wiring_shift.c \ - core/wiring_analog.c \ - core/time.c \ - core/pwm.c \ - core/ext_interrupts.c \ - core/wiring_digital.c - -CSRC += $(STM32SRCS) +CSRC = libmaple/systick.c \ + libmaple/timers.c \ + libmaple/adc.c \ + libmaple/syscalls.c \ + libmaple/stm32f10x_it.c \ + libmaple/exti.c \ + libmaple/gpio.c \ + libmaple/nvic.c \ + libmaple/usart.c \ + libmaple/util.c \ + libmaple/usb.c \ + libmaple/rcc.c \ + libmaple/flash.c \ + core/wiring.c \ + core/wiring_shift.c \ + core/wiring_analog.c \ + core/time.c \ + core/pwm.c \ + core/ext_interrupts.c \ + core/wiring_digital.c + CPPSRC = core/wiring_math.cpp \ core/Print.cpp \ -- cgit v1.2.3