From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 1 Feb 2014 05:11:09 +0000 (+0000)
Subject: Update makefiles
X-Git-Url: http://pileus.org/git/?p=~andy%2Fcsm213a-hw;a=commitdiff_plain;h=415f34914ef7031ec1b018b4fcfe4721a2bc8151

Update makefiles
---

diff --git a/common.mk b/common.mk
index 710c645..374049e 100644
--- a/common.mk
+++ b/common.mk
@@ -15,10 +15,14 @@ CPPFLAGS += -I$(MBED) -I$(MBED)/TARGET_KL46Z
 CFLAGS   += -mthumb -mcpu=cortex-m0plus
 CXXFLAGS += -mthumb -mcpu=cortex-m0plus -fno-exceptions
 
-LDFLAGS  += --specs=nano.specs -Wl,--gc-sections \
+LDFLAGS  += --specs=nano.specs -Wl,-u_printf_float -Wl,--gc-sections \
             -T$(MBED)/TARGET_KL46Z/TOOLCHAIN_GCC_ARM/MKL46Z4.ld \
             -L$(MBED)/TARGET_KL46Z/TOOLCHAIN_GCC_ARM \
-            -Wl,--start-group -lmbed -lstartup -lio -lc_s -Wl,--end-group
+            $(MBED)/TARGET_KL46Z/TOOLCHAIN_GCC_ARM/cmsis_nvic.o \
+            $(MBED)/TARGET_KL46Z/TOOLCHAIN_GCC_ARM/retarget.o \
+            $(MBED)/TARGET_KL46Z/TOOLCHAIN_GCC_ARM/startup_MKL46Z4.o \
+            $(MBED)/TARGET_KL46Z/TOOLCHAIN_GCC_ARM/system_MKL46Z4.o \
+            -Wl,--start-group -lmbed -lc_s -lstdc++_s -Wl,--end-group
 
 # Targets
 all: $(PROG).bin
@@ -59,6 +63,10 @@ clean:
 	@echo "CXX  $<"
 	@$(GXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
 
+%.o: %.cpp makefile ../common.mk ../config.mk
+	@echo "CXX  $<"
+	@$(GXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
+
 $(PROG).elf: $(OBJS)
 	@echo "LD   $+"
 	@$(GLD) $(CFLAGS) -o $@ $^ $(LDFLAGS)