diff options
author | Perry Hung <iperry@alum.mit.edu> | 2010-04-29 01:14:03 -0400 |
---|---|---|
committer | Perry Hung <iperry@alum.mit.edu> | 2010-04-29 01:14:03 -0400 |
commit | b5ddce7dc81a0ae313cce635bce02028db32d5de (patch) | |
tree | ea67f3f0c3c288c3c0e4b31454e54cb016a9b1b0 /Makefile | |
parent | 2c51cc19ccb5c08eb4d89d197623da6cd92b35f7 (diff) | |
download | librambutan-b5ddce7dc81a0ae313cce635bce02028db32d5de.tar.gz librambutan-b5ddce7dc81a0ae313cce635bce02028db32d5de.zip |
Fixed examples, added spi example, moved pure virtual function handler
out of main to cxxabi-compat.cpp.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -44,7 +44,7 @@ CFLAGS = $(INCLUDES) -c \ -ffunction-sections -fdata-sections -Wl,--gc-sections \ -D$(DEFFLAGS) -CPPFLAGS = -fno-rtti -fno-exceptions -Wall +CXXFLAGS = -fno-rtti -fno-exceptions -Wall #LINKER=lanchon-stm32.ld LFLAGS = -Tstm32conf/$(LINKER) -L stm32conf/lanchon-stm32 \ @@ -84,6 +84,7 @@ CPPSRC = wirish/wirish_math.cpp \ wirish/comm/HardwareSerial.cpp \ wirish/comm/HardwareUsb.cpp \ wirish/comm/HardwareSPI.cpp \ + wirish/cxxabi-compat.cpp \ main.cpp # i really have no idea what i'm doing @@ -144,7 +145,7 @@ $(COBJ) : $(BUILD_PATH)/%.o : %.c $(CPPOBJ) : $(BUILD_PATH)/%.o : %.cpp @echo $(MSG_COMPILING) $< - $(CPP) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CFLAGS) $(CXXFLAGS) -c $< -o $@ @echo # targets |