diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2015-03-25 17:42:19 +0530 |
|---|---|---|
| committer | Sudar Muthu <sudar@sudarmuthu.com> | 2015-03-25 17:42:19 +0530 |
| commit | 43e5f03746e3f9347f2428bed16cd32a5f10567c (patch) | |
| tree | 48c116a446cde4aeae49ce8d7382d806db7602fa | |
| parent | ea67b57949f55082df35c283b84c9dfcc12dec15 (diff) | |
| parent | 495a0b8f91fe29967358f1ef620dce01cde6db8d (diff) | |
Merge pull request #329 from sej7278/master
Added search of PLATFORM_LIB_NAMES to ARDUINO_LIBS
| -rw-r--r-- | Arduino.mk | 14 | ||||
| -rw-r--r-- | HISTORY.md | 1 |
2 files changed, 11 insertions, 4 deletions
@@ -814,6 +814,8 @@ ifndef ARDUINO_LIBS $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS))) ARDUINO_LIBS += $(filter $(notdir $(wildcard $(USER_LIB_PATH)/*)), \ $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS))) + ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_PLATFORM_LIB_PATH)/*)), \ + $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS))) endif ######################################################################## @@ -912,15 +914,15 @@ get_library_files = $(if $(and $(wildcard $(1)/src), $(wildcard $(1)/library.pr $(wildcard $(1)/*.$(2) $(1)/utility/*.$(2))) # General arguments -USER_LIBS := $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))) +USER_LIBS := $(sort $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS)))) USER_LIB_NAMES := $(patsubst $(USER_LIB_PATH)/%,%,$(USER_LIBS)) # Let user libraries override system ones. -SYS_LIBS := $(wildcard $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS)))) +SYS_LIBS := $(sort $(wildcard $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS))))) SYS_LIB_NAMES := $(patsubst $(ARDUINO_LIB_PATH)/%,%,$(SYS_LIBS)) ifdef ARDUINO_PLATFORM_LIB_PATH - PLATFORM_LIBS := $(wildcard $(patsubst %,$(ARDUINO_PLATFORM_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS)))) + PLATFORM_LIBS := $(sort $(wildcard $(patsubst %,$(ARDUINO_PLATFORM_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS))))) PLATFORM_LIB_NAMES := $(patsubst $(ARDUINO_PLATFORM_LIB_PATH)/%,%,$(PLATFORM_LIBS)) endif @@ -1096,10 +1098,14 @@ ifneq (,$(strip $(USER_LIB_NAMES))) $(foreach lib,$(USER_LIB_NAMES),$(call show_config_info, $(lib),[USER])) endif -ifneq (,$(strip $(SYS_LIB_NAMES) $(PLATFORM_LIB_NAMES))) +ifneq (,$(strip $(SYS_LIB_NAMES))) $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info, $(lib),[SYSTEM])) endif +ifneq (,$(strip $(PLATFORM_LIB_NAMES))) + $(foreach lib,$(PLATFORM_LIB_NAMES),$(call show_config_info, $(lib),[PLATFORM])) +endif + # either calculate parent dir from arduino dir, or user-defined path ifndef BOOTLOADER_PARENT BOOTLOADER_PARENT = $(ARDUINO_DIR)/hardware/$(VENDOR)/$(ARCHITECTURE)/bootloaders @@ -44,6 +44,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Allow avrdude to erase the chip before programming during ispload (https://github.com/tchebb) - Fix: Fix speed regression. Thanks ladislas (Issue #280) (https://github.com/sej7278) - Fix: Removed some double quotes that were breaking variable expansion. (https://github.com/sej7278) +- Fix: Fixed PLATFORM_LIB support for 1.5+ and removed duplicate libs (https://github.com/sej7278) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav) |