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

Merge pull request #137 from peplin/chipkit-avrdude-mac

Browse source 
Adjust path to avrdude/avrdude.conf for MPIDE in Linux.
This commit is contained in:
Sudar 2013-12-09 05:47:19 -08:00
commit 25a00d73b7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arduino-mk/chipKIT.mk
View file

@ -72,9 +72,17 @@ endif
AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools
AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools # The same as in Arduino, the Linux distribution contains avrdude and
AVRDUDE = $(AVRDUDE_DIR)/avrdude # avrdude.conf in a different location.
AVRDUDE_CONF = $(AVRDUDE_DIR)/avrdude.conf ifeq ($(CURRENT_OS),LINUX)
AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools
AVRDUDE = $(AVRDUDE_DIR)/avrdude
AVRDUDE_CONF = $(AVRDUDE_DIR)/avrdude.conf
else
AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools/avr
AVRDUDE = $(AVRDUDE_DIR)/bin/avrdude
AVRDUDE_CONF = $(AVRDUDE_DIR)/etc/avrdude.conf
endif
ALTERNATE_CORE = pic32 ALTERNATE_CORE = pic32
ALTERNATE_CORE_PATH = $(MPIDE_DIR)/hardware/pic32 ALTERNATE_CORE_PATH = $(MPIDE_DIR)/hardware/pic32