aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2015-03-25 19:29:21 +0000
committerSimon John <git@the-jedi.co.uk>2015-03-25 19:29:21 +0000
commit356f5b3e04d499dd8caf7da583c82ee1d40c9bdd (patch)
tree9dea75d06c30096a48b74bdeb20f6f1b55000e38
parent43e5f03746e3f9347f2428bed16cd32a5f10567c (diff)
Added ARCHITECTURE to ALTERNATE_CORE_PATH to support 1.5+ cores like arduino-tiny.
arduino-tiny and damellis' attiny85 cores don't use a vendor, but they do use the avr architecture (subdirectory) in their 1.5/1.6 branches. arduino-tiny builds and is auto-detected now, still needs some work to support sub-cpu's and clocks. damellis doesn't compile, but that's not our makefile it seems.
-rw-r--r--Arduino.mk2
-rw-r--r--HISTORY.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 8f37089..d4fe5cc 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -475,7 +475,7 @@ ifdef ALTERNATE_CORE
$(call show_config_variable,ALTERNATE_CORE,[USER])
ifndef ALTERNATE_CORE_PATH
- ALTERNATE_CORE_PATH = $(ARDUINO_SKETCHBOOK)/hardware/$(ALTERNATE_CORE)
+ ALTERNATE_CORE_PATH = $(ARDUINO_SKETCHBOOK)/hardware/$(ALTERNATE_CORE)/$(ARCHITECTURE)
endif
endif
diff --git a/HISTORY.md b/HISTORY.md
index ecd12b6..0a73493 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -45,6 +45,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- 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)
+- Fix: Added ARCHITECTURE to ALTERNATE_CORE_PATH to support 1.5+ cores like arduino-tiny (https://github.com/sej7278)
### 1.3.4 (2014-07-12)
- Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)