aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPerry Hung <iperry@alum.mit.edu>2010-03-30 22:50:18 -0400
committerPerry Hung <iperry@alum.mit.edu>2010-03-30 22:51:28 -0400
commit869ed39e4c28ebb9813a8b28192d4ca92f72bf22 (patch)
tree6293c34e1dc96ae3f7c0bfdd926a714c03062ae2 /Makefile
parent2c33d55bae8f9e0e009634072ab05302fc734a65 (diff)
downloadlibrambutan-869ed39e4c28ebb9813a8b28192d4ca92f72bf22.tar.gz
librambutan-869ed39e4c28ebb9813a8b28192d4ca92f72bf22.zip
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile49
1 files changed, 23 insertions, 26 deletions
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 \