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

Use different variables for Arduino/MPIDE path and quit if they're not set.

Browse source
This commit is contained in:
Christopher Peplin 2012-04-02 15:43:40 -04:00
parent 61d37eab82
commit c614cafa4d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arduino-mk/Arduino.mk
View file

@ -183,7 +183,9 @@ endif
# Some paths # Some paths
# #
ifneq (ARDUINO_DIR,) ifeq ($(wildcard $(ARDUINO_DIR)),)
$(error "Error: the ARDUINO_DIR variable must point to your Arduino IDE installation")
endif
ifndef AVR_TOOLS_PATH ifndef AVR_TOOLS_PATH
AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools
@ -221,8 +223,6 @@ ifndef ARDUINO_VAR_PATH
ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/arduino/variants ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/arduino/variants
endif endif
endif
######################################################################## ########################################################################
# boards.txt parsing # boards.txt parsing
# #

6
arduino-mk/chipKIT.mk
View file

@ -13,6 +13,12 @@
OSTYPE := $(shell uname) OSTYPE := $(shell uname)
ifeq ($(wildcard $(MPIDE_DIR)),)
$(error "Error: the MPIDE_DIR variable must point to your MPIDE installation")
endif
ARDUINO_DIR = $(MPIDE_DIR)
AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools/bin AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools/bin
ifneq ($(OSTYPE),Linux) ifneq ($(OSTYPE),Linux)