aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorajmeyer@mit.edu <ajmeyer@mit.edu@749a229e-a60e-11de-b98f-4500b42dc123>2009-12-19 08:03:54 +0000
committerajmeyer@mit.edu <ajmeyer@mit.edu@749a229e-a60e-11de-b98f-4500b42dc123>2009-12-19 08:03:54 +0000
commit7021adc50a041bfb69bc4432b712aa07ef710ca3 (patch)
tree4dcc3be7576e0ad5dd52039d3d99f3c6f99ea448 /Makefile
parenta8aaabae4c1cc64a01d740a436336ca31c1f79ba (diff)
downloadlibrambutan-7021adc50a041bfb69bc4432b712aa07ef710ca3.tar.gz
librambutan-7021adc50a041bfb69bc4432b712aa07ef710ca3.zip
added USB support (TX over virtual com port), the linker modifications to work with the bootloader, a modified libcs-lanchon-stm32.a, and the arduino-required main.cxx and WProgram.h
git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@72 749a229e-a60e-11de-b98f-4500b42dc123
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 00db7a9..8da91d2 100644
--- a/Makefile
+++ b/Makefile
@@ -33,15 +33,17 @@ INCLUDES = -Isrc/stm32lib/inc \
-Isrc/wiring \
-Isrc/wiring/comm
+DEFFLAGS=VECT_TAB_BASE
CFLAGS = -I./ $(INCLUDES) -c \
-Os\
-g -mcpu=cortex-m3 -mthumb -march=armv7-m -nostdlib \
- -ffunction-sections -fdata-sections -Wl,--gc-sections
-
+ -ffunction-sections -fdata-sections -Wl,--gc-sections \
+ -D$(DEFFLAGS)
CPPFLAGS = -fno-rtti -fno-exceptions -Wall
-LFLAGS = -Tstm32conf/lanchon-stm32.ld -L stm32conf/lanchon-stm32 \
+LINKER=lanchon-stm32.ld
+LFLAGS = -Tstm32conf/$(LINKER) -L stm32conf/lanchon-stm32 \
-mcpu=cortex-m3 -mthumb -Xlinker \
--gc-sections --print-gc-sections --march=armv7-m -Wall
@@ -63,6 +65,7 @@ CSRC = lib/systick.c \
lib/exti.c \
lib/gpio.c \
lib/usart.c \
+ lib/usb.c \
wiring/wiring.c \
wiring/wiring_shift.c \
wiring/wiring_analog.c \