dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #390 from thomaskilian/master

Browse source 
Correct path ARDUINO_DIR for Macs

Merged and thanks for the PR @thomaskilian
This commit is contained in:
Simon John 2015-09-21 22:56:44 +01:00
commit 02a1811d45
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Arduino.mk
View file

@ -45,11 +45,16 @@
# that things are canonically arranged beneath the directories defined # that things are canonically arranged beneath the directories defined
# above. # 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 # ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
# ARDMK_DIR = /usr/local # 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: # On Linux, you might prefer:
# #
# ARDUINO_DIR = /usr/share/arduino # ARDUINO_DIR = /usr/share/arduino

1
HISTORY.md
View file

@ -20,6 +20,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Fix: Make sure TARGET is set correctly when CURDIR contains spaces (https://github.com/svendahlstrand) - Fix: Make sure TARGET is set correctly when CURDIR contains spaces (https://github.com/svendahlstrand)
- Fix: Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is, not just on Windows (Issue #381) (https://github.com/sej7278) - Fix: Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is, not just on Windows (Issue #381) (https://github.com/sej7278)
- Fix: Rename VENDOR to ARDMK_VENDOR to workaround tcsh issue (Issue #386) (https://github.com/sej7278) - Fix: Rename VENDOR to ARDMK_VENDOR to workaround tcsh issue (Issue #386) (https://github.com/sej7278)
- Fix: Document OSX 1.0/1.6 ARDUINO_DIR differences (https://github.com/thomaskilian)
### 1.5 (2015-04-07) ### 1.5 (2015-04-07)
- New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e) - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)

8
README.md
View file

@ -134,7 +134,7 @@ whilst [Blink](examples/Blink/Makefile) demonstrates the minimal settings requir
Download a copy of this repo some where in your system or install it through a package. Download a copy of this repo some where in your system or install it through a package.
On the Mac you might want to set: On the Mac with IDE 1.0 you might want to set:
```make ```make
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
@ -144,6 +144,12 @@ On the Mac you might want to set:
BOARD_TAG = mega2560 BOARD_TAG = mega2560
``` ```
On the Mac with IDE 1.5+ it's like above but with
```
ARDUINO_DIR = /Applications/Arduino.app/Contents/Java
```
On Linux (if you have installed through package), you shouldn't need to set anything other than your board type and port: On Linux (if you have installed through package), you shouldn't need to set anything other than your board type and port:
```make ```make

2
examples/MakefileExample/Makefile-example.mk
View file

@ -15,7 +15,7 @@ ARDMK_DIR = $(PROJECT_DIR)/Arduino-Makefile
### ARDUINO_DIR ### ARDUINO_DIR
### Path to the Arduino application and resources directory. ### Path to the Arduino application and resources directory.
### On OS X: ### On OS X:
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Java
### or on Linux: (remove the one you don't want) ### or on Linux: (remove the one you don't want)
ARDUINO_DIR = /usr/share/arduino ARDUINO_DIR = /usr/share/arduino