From 5e84af6de3d674d5f788682c55a9b41ce9d1426a Mon Sep 17 00:00:00 2001 From: Simon John Date: Sun, 12 Jan 2014 15:49:04 +0000 Subject: [PATCH] include Arduino.mk earlier so the functions that were in Common.mk are found --- arduino-mk/chipKIT.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk index 90add05..d010a6f 100644 --- a/arduino-mk/chipKIT.mk +++ b/arduino-mk/chipKIT.mk @@ -28,6 +28,8 @@ ifndef ARDMK_DIR ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))) endif +include $(ARDMK_DIR)/Arduino.mk + ifndef MPIDE_DIR AUTO_MPIDE_DIR := $(firstword \ $(call dir_if_exists,/usr/share/mpide) \ @@ -52,7 +54,6 @@ ifndef MPIDE_PREFERENCES_PATH endif endif - AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools # The same as in Arduino, the Linux distribution contains avrdude and @@ -92,5 +93,3 @@ LDFLAGS += -T$(ARDUINO_CORE_PATH)/$(LDSCRIPT) LDFLAGS += -T$(ARDUINO_CORE_PATH)/chipKIT-application-COMMON.ld CPPFLAGS += -mno-smart-io -fno-short-double CFLAGS_STD = - -include $(ARDMK_DIR)/Arduino.mk