diff options
| author | Sudar <sudar@sudarmuthu.com> | 2014-07-01 11:03:45 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-07-01 11:03:45 +0530 |
| commit | 1f950db032f430177395aeb4685d04a75728d9b2 (patch) | |
| tree | 146037cd313d26504ed18a7f6ed2e7167cda7a83 | |
| parent | 20ccdf141472dc490217d77e8085e24b7acd7cc9 (diff) | |
| parent | 437a0f54b55115dd9ac0ea02dc355306692ff5d8 (diff) | |
Merge pull request #218 from sej7278/master
Build core objects in subdirectory, fix issue #82 and fix #218
| -rw-r--r-- | Arduino.mk | 8 | ||||
| -rw-r--r-- | HISTORY.md | 1 |
2 files changed, 5 insertions, 4 deletions
@@ -684,7 +684,7 @@ ifeq ($(strip $(NO_CORE)),) CORE_OBJ_FILES = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) $(CORE_AS_SRCS:.S=.o) CORE_OBJS = $(patsubst $(ARDUINO_CORE_PATH)/%, \ - $(OBJDIR)/%,$(CORE_OBJ_FILES)) + $(OBJDIR)/core/%,$(CORE_OBJ_FILES)) endif else $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL]) @@ -1016,15 +1016,15 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) # $(AS) -$(MCU_FLAG_NAME)=$(MCU) -alhnd $< > $@ # core files -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) +$(OBJDIR)/core/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS) | $(OBJDIR) +$(OBJDIR)/core/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.S $(COMMON_DEPS) | $(OBJDIR) +$(OBJDIR)/core/%.o: $(ARDUINO_CORE_PATH)/%.S $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ @@ -15,6 +15,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - New: Arduino.mk is now compatible with Flymake mode (https://github.com/rbarzic) - Fix: MONITOR_PORT detection (Issue #213, #215) (https://github.com/sej7278) - Tweak: Audited regexes/quoting/wildcards (Issue #192) (https://github.com/sej7278) +- New: Build core objects in subdirectory (Issue #82) (https://github.com/sej7278) ### 1.3.3 (2014-04-12) - Fix: Make a new manpage for ard-reset-arduino. Fixes issue #188 (https://github.com/sej7278) |