From 713997d6024a323216a97136fc2f06abf56a5f57 Mon Sep 17 00:00:00 2001 From: Simon John Date: Wed, 5 Nov 2014 15:09:43 +0000 Subject: [PATCH] Made CXX compile *.cpp files instead of CC. Fixes issue #285 --- Arduino.mk | 6 +++--- HISTORY.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Arduino.mk b/Arduino.mk index 1e840bf..0c29498 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1079,7 +1079,7 @@ $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.c $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.cpp @$(MKDIR) $(dir $@) - $(CC) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.S @$(MKDIR) $(dir $@) @@ -1091,7 +1091,7 @@ $(OBJDIR)/platformlibs/%.o: $(ARDUINO_PLATFORM_LIB_PATH)/%.c $(OBJDIR)/platformlibs/%.o: $(ARDUINO_PLATFORM_LIB_PATH)/%.cpp @$(MKDIR) $(dir $@) - $(CC) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/platformlibs/%.o: $(ARDUINO_PLATFORM_LIB_PATH)/%.S @$(MKDIR) $(dir $@) @@ -1099,7 +1099,7 @@ $(OBJDIR)/platformlibs/%.o: $(ARDUINO_PLATFORM_LIB_PATH)/%.S $(OBJDIR)/userlibs/%.o: $(USER_LIB_PATH)/%.cpp @$(MKDIR) $(dir $@) - $(CC) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/userlibs/%.o: $(USER_LIB_PATH)/%.c @$(MKDIR) $(dir $@) diff --git a/HISTORY.md b/HISTORY.md index 7fe05a9..0b82eca 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -30,6 +30,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Remove impact of travis-ci from regular users. (Issue #258). (https://github.com/sej7278) - Fix: objcopy quoting issue on Windows. (Issue #272). (https://github.com/sej7278) - Fix: Add "avrispmkii" to the list of isp that don't have a port. (Issue #279). (https://github.com/sej7278) +- Fix: Make CXX compile .cpp files instead of CC. (Issue #285). (https://github.com/sej7278) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)