From b5ddce7dc81a0ae313cce635bce02028db32d5de Mon Sep 17 00:00:00 2001
From: Perry Hung <iperry@alum.mit.edu>
Date: Thu, 29 Apr 2010 01:14:03 -0400
Subject: Fixed examples, added spi example, moved pure virtual function
 handler out of main to cxxabi-compat.cpp.

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 875e458..ce274c6 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3