X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=common.mk;h=a0f65a8959b1c5606dbd6303169c391d49a7ccb1;hb=fcf3a5999ccfbb4a88f747ee3d9ed1c9c81891de;hp=710c64504f16a2389493ef5b842450c150f71c0c;hpb=1025b8971dde3517c15107fcf0d8e9848ac3e03f;p=~andy%2Fcsm213a-hw

diff --git a/common.mk b/common.mk
index 710c645..a0f65a8 100644
--- a/common.mk
+++ b/common.mk
@@ -6,8 +6,8 @@ GXX      ?= arm-none-eabi-g++
 GLD      ?= arm-none-eabi-gcc
 OBJCOPY  ?= arm-none-eabi-objcopy
 
-CFLAGS   ?= -Wall -Os -g --std=gnu99
-CXXFLAGS ?= -Wall -Os -g --std=gnu++98
+CFLAGS   ?= -Wall -g --std=gnu99
+CXXFLAGS ?= -Wall -g --std=gnu++98
 
 # Cross compiler flags
 CPPFLAGS += -I$(MBED) -I$(MBED)/TARGET_KL46Z
@@ -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
@@ -51,11 +55,15 @@ clean:
 	@rm -f $(PROG).bin $(PROG).elf $(OBJS)
 
 # Rules
-%.o: %.c makefile ../common.mk ../config.mk
+%.o: %.c $(wildcard *.h) makefile ../common.mk ../config.mk
 	@echo "CC   $<"
 	@$(GCC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
-%.o: %.cc makefile ../common.mk ../config.mk
+%.o: %.cc $(wildcard *.h) makefile ../common.mk ../config.mk
+	@echo "CXX  $<"
+	@$(GXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+%.o: %.cpp $(wildcard *.h) makefile ../common.mk ../config.mk
 	@echo "CXX  $<"
 	@$(GXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<