From aa879d8db864cdbc51408f5982ebcc7530626813 Mon Sep 17 00:00:00 2001 From: Simon John Date: Thu, 21 Aug 2014 06:35:21 +0200 Subject: Allow libraries/sketches to have the same name as system libs, e.g. main or Wire Doesn't seem to work with main.cpp but main.ino works. Fixes issue #229 and #244 --- Arduino.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index f9819eb..ea5b798 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -874,9 +874,9 @@ USER_LIB_AS_SRCS = $(wildcard $(patsubst %,%/*.S,$(USER_LIBS))) LIB_OBJS = $(patsubst $(ARDUINO_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(LIB_C_SRCS)) \ $(patsubst $(ARDUINO_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(LIB_CPP_SRCS)) \ $(patsubst $(ARDUINO_LIB_PATH)/%.S,$(OBJDIR)/libs/%.o,$(LIB_AS_SRCS)) -USER_LIB_OBJS = $(patsubst $(USER_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(USER_LIB_CPP_SRCS)) \ - $(patsubst $(USER_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(USER_LIB_C_SRCS)) \ - $(patsubst $(USER_LIB_PATH)/%.S,$(OBJDIR)/libs/%.o,$(USER_LIB_AS_SRCS)) +USER_LIB_OBJS = $(patsubst $(USER_LIB_PATH)/%.cpp,$(OBJDIR)/userlibs/%.o,$(USER_LIB_CPP_SRCS)) \ + $(patsubst $(USER_LIB_PATH)/%.c,$(OBJDIR)/userlibs/%.o,$(USER_LIB_C_SRCS)) \ + $(patsubst $(USER_LIB_PATH)/%.S,$(OBJDIR)/userlibs/%.o,$(USER_LIB_AS_SRCS)) # Dependency files DEPS = $(LOCAL_OBJS:.o=.d) $(LIB_OBJS:.o=.d) $(USER_LIB_OBJS:.o=.d) $(CORE_OBJS:.o=.d) @@ -1034,15 +1034,15 @@ $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.S @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ -$(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.cpp +$(OBJDIR)/userlibs/%.o: $(USER_LIB_PATH)/%.cpp @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -$(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c +$(OBJDIR)/userlibs/%.o: $(USER_LIB_PATH)/%.c @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -$(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.S +$(OBJDIR)/userlibs/%.o: $(USER_LIB_PATH)/%.S @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ -- cgit v1.2.3 From 9a6b0ef75f2ca43fb495945dde5014ccae934c58 Mon Sep 17 00:00:00 2001 From: Simon John Date: Fri, 22 Aug 2014 17:57:30 +0200 Subject: Added *.cpp to extensions supported by "make generate_assembly" --- Arduino.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index ea5b798..c1981d0 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1092,8 +1092,9 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -#$(OBJDIR)/%.lst: $(OBJDIR)/%.s -# $(AS) -$(MCU_FLAG_NAME)=$(MCU) -alhnd $< > $@ +$(OBJDIR)/%.s: %.cpp $(COMMON_DEPS) | $(OBJDIR) + @$(MKDIR) $(dir $@) + $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # core files $(OBJDIR)/core/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) -- cgit v1.2.3