aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2015-03-28 17:26:30 +0530
committerSudar <sudar@sudarmuthu.com>2015-03-28 17:26:30 +0530
commit16924fe60eb6b4728bc37a4a50424fa3abb646fa (patch)
tree062bfa5b249927197dc572f32a80011c8032ca4f
parent1dfcb941b3dbd96acceb68a452aa91dce384947b (diff)
Locate 1.5+ preferences.txt file on Mac
-rw-r--r--Arduino.mk2
-rw-r--r--HISTORY.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/Arduino.mk b/Arduino.mk
index c8cd3b2..e35da90 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -332,7 +332,7 @@ ifndef ARDUINO_SKETCHBOOK
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
+ $(call dir_if_exists,$(HOME)/Library/Arduino15/preferences.txt) )
else
AUTO_ARDUINO_PREFERENCES := $(firstword \
$(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \
diff --git a/HISTORY.md b/HISTORY.md
index 23d25ba..dfa56b7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -48,7 +48,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- 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)
-- Fix: Can now find IDE 1.5+ preferences.txt on Linux at least (https://github.com/sej7278)
+- Fix: Can now find IDE 1.5+ preferences.txt on Linux and Mac (https://github.com/sej7278)
### 1.3.4 (2014-07-12)
- Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)