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

Changed AVRDUDE_CONF so it can be defined in per-project makefile

Browse source
This commit is contained in:
Adam Dunlap 2012-06-10 15:06:08 -07:00
parent 1e5d7c1a33
commit 4a81c19a8b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arduino-mk/Arduino.mk
View file

@ -285,8 +285,6 @@ ifdef ARDUINO_DIR
ifndef AVR_TOOLS_DIR ifndef AVR_TOOLS_DIR
AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/tools/avr AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/tools/avr
# The avrdude bundled with Arduino can't find it's config
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
endif endif
ifndef AVR_TOOLS_PATH ifndef AVR_TOOLS_PATH
@ -612,6 +610,14 @@ ifndef AVRDUDE
AVRDUDE = $(AVR_TOOLS_PATH)/avrdude AVRDUDE = $(AVR_TOOLS_PATH)/avrdude
endif endif
ifndef AVRDUDE_CONF
ifndef AVR_TOOLS_DIR
# The avrdude bundled with Arduino can't find its config
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
endif
# If avrdude is installed separately, it can find its own config flie
endif
AVRDUDE_COM_OPTS = -q -V -p $(MCU) AVRDUDE_COM_OPTS = -q -V -p $(MCU)
ifdef AVRDUDE_CONF ifdef AVRDUDE_CONF
AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF) AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)