aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorstepcut <jeremy@n-heptane.com>2014-10-22 15:27:59 -0500
committerstepcut <jeremy@n-heptane.com>2014-10-22 15:27:59 -0500
commit6534cf8f15e64df55bb98576e43fb46855bdbd2a (patch)
tree1bf50d2d2254fc8590423944c60491bf2b33b2ed /Arduino.mk
parent1f5e0b33671fe1032163a3a8e3af9366cd758b9b (diff)
move ARDUINO_DIR auto-detection into Common.mk. This allows Teensy.mk to use auto-detected location.
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk23
1 files changed, 0 insertions, 23 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 76a7d5e..beda93e 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -263,29 +263,6 @@ else
endif
########################################################################
-# Arduino Directory
-
-ifndef ARDUINO_DIR
- AUTO_ARDUINO_DIR := $(firstword \
- $(call dir_if_exists,/usr/share/arduino) \
- $(call dir_if_exists,/Applications/Arduino.app/Contents/Resources/Java) )
- ifdef AUTO_ARDUINO_DIR
- ARDUINO_DIR = $(AUTO_ARDUINO_DIR)
- $(call show_config_variable,ARDUINO_DIR,[AUTODETECTED])
- else
- echo $(error "ARDUINO_DIR is not defined")
- endif
-else
- $(call show_config_variable,ARDUINO_DIR,[USER])
-endif
-
-ifeq ($(CURRENT_OS),WINDOWS)
- ifneq ($(shell echo $(ARDUINO_DIR) | egrep '^(/|[a-zA-Z]:\\)'),)
- echo $(error On Windows, ARDUINO_DIR must be a relative path)
- endif
-endif
-
-########################################################################
# Default TARGET to pwd (ex Daniele Vergini)
ifndef TARGET