diff options
| author | Simon John <git@the-jedi.co.uk> | 2015-03-27 16:57:45 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2015-03-27 16:57:45 +0000 |
| commit | 8d52840eb86fa45158a8b7387931ea5e43e2b4a6 (patch) | |
| tree | 50048e4af8df9fb2534b133fb5de2f6ffd1e2b1b /Arduino.mk | |
| parent | ce235b6bb3465452ebbe6ae257639cc550654287 (diff) | |
Now we know that arduino 1.6.1 uses the ~/.arduino15 directory
we can find preferences.txt
Still need to find out where it looks on OSX/Cygwin
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 12 |
1 files changed, 9 insertions, 3 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]) |