diff options
| -rw-r--r-- | HISTORY.md | 1 | ||||
| -rw-r--r-- | arduino-mk/Arduino.mk | 8 |
2 files changed, 8 insertions, 1 deletions
@@ -6,6 +6,7 @@ The following is the rough list of changes that went into different versions. I ### 0.10.5 (in development) - Add USB_VID and USB_PID to CPPFLAGS only if the board is Leonardo. - Allow adding extra common dependencies (COMMON_DEPS) (https://github.com/gaftech) +- Added ifndef ARDUINO_VAR_PATH for compiling for the attiny (https://github.com/danielesteban) ### 0.10.4 (2013-05-31) @matthijskooijman - Improved BAUD_RATE detection logic diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index f7b6b4c..d58ea4a 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -303,7 +303,13 @@ ifdef ARDUINO_DIR ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries $(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/cores/arduino - ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/arduino/variants + + ifndef ARDUINO_VAR_PATH + ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/arduino/variants + $(call show_config_variable,ARDUINO_VAR_PATH,[COMPUTED],(from ARDUINO_DIR)) + else + $(call show_config_variable,ARDUINO_VAR_PATH,[USER]) + endif else |