aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2015-09-21 22:56:44 +0100
committerSimon John <git@the-jedi.co.uk>2015-09-21 22:56:44 +0100
commit02a1811d454340a7b7ad1d5123bb96d623c805fb (patch)
tree552c7ca7ae470f5561e62a0d0d14396f5b0dd80a /Arduino.mk
parent0ce685b1a193fb4b68d7a7e8d4ed95bed8a697af (diff)
parentcba515531cdebc1bcb65527a1682a0e7ff362f5a (diff)
Merge pull request #390 from thomaskilian/master
Correct path ARDUINO_DIR for Macs Merged and thanks for the PR @thomaskilian
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 561793d..eb94a3c 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -45,11 +45,16 @@
# that things are canonically arranged beneath the directories defined
# above.
#
-# On the Mac you might want to set:
+# On the Mac with IDE 1.0 you might want to set:
#
# ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
# ARDMK_DIR = /usr/local
#
+# On the Mac with IDE 1.5+ you might want to set:
+#
+# ARDUINO_DIR = /Applications/Arduino.app/Contents/Java
+# ARDMK_DIR = /usr/local
+#
# On Linux, you might prefer:
#
# ARDUINO_DIR = /usr/share/arduino