diff options
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -329,10 +329,16 @@ endif ifndef ARDUINO_SKETCHBOOK ifndef ARDUINO_PREFERENCES_PATH + ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1) + AUTO_ARDUINO_PREFERENCES := $(firstword \ + $(call dir_if_exists,$(HOME)/.arduino15/preferences.txt) ) + # TODO: add mac/windows version once known + else + AUTO_ARDUINO_PREFERENCES := $(firstword \ + $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \ + $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) ) + endif - AUTO_ARDUINO_PREFERENCES := $(firstword \ - $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \ - $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) ) ifdef AUTO_ARDUINO_PREFERENCES ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES) $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED]) @@ -552,7 +558,7 @@ endif ifndef PARSE_BOARD # result = $(call READ_BOARD_TXT, 'boardname', 'parameter') - PARSE_BOARD = $(shell grep -v '^\#' $(BOARDS_TXT) | grep $(1).$(2) | cut -d = -f 2 ) + PARSE_BOARD = $(shell grep -v '^\#' $(BOARDS_TXT) | grep $(1).$(2)= | cut -d = -f 2 ) endif # If NO_CORE is set, then we don't have to parse boards.txt file |