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

Fix and test paths on Arduino in both Linux and OS X.

Browse source
This commit is contained in:
Christopher Peplin 2012-04-03 10:49:06 -04:00
parent ab5de3ae40
commit 99ee6914a5
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arduino-mk/Arduino.mk
View file

@ -187,12 +187,28 @@ OSTYPE := $(shell uname)
ifneq (ARDUINO_DIR,) ifneq (ARDUINO_DIR,)
ifndef AVR_TOOLS_PATH ifndef TOOLS_PATH
AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools/
endif endif
ifndef ARDUINO_ETC_PATH ifndef AVR_TOOLS_PATH
ARDUINO_ETC_PATH = $(ARDUINO_DIR)/hardware/tools/avr/etc AVR_TOOLS_PATH = $(TOOLS_PATH)/avr/bin/
endif
ifndef AVRDUDE_TOOLS_PATH
ifeq ($(OSTYPE),Linux)
AVRDUDE_TOOLS_PATH = $(TOOLS_PATH)
else
AVRDUDE_TOOLS_PATH = $(TOOLS_PATH)/avr/bin
endif
endif
ifndef AVRDUDE_ETC_PATH
ifeq ($(OSTYPE),Linux)
AVRDUDE_ETC_PATH = $(TOOLS_PATH)
else
AVRDUDE_ETC_PATH = $(TOOLS_PATH)/avr/etc
endif
endif endif
ifndef AVRDUDE_CONF ifndef AVRDUDE_CONF