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

include Arduino.mk earlier so the functions that were in Common.mk are found

Browse source
This commit is contained in:
Simon John 2014-01-12 15:49:04 +00:00
parent 73684a07df
commit 5e84af6de3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arduino-mk/chipKIT.mk
View file

@ -28,6 +28,8 @@ ifndef ARDMK_DIR
ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))) ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
endif endif
include $(ARDMK_DIR)/Arduino.mk
ifndef MPIDE_DIR ifndef MPIDE_DIR
AUTO_MPIDE_DIR := $(firstword \ AUTO_MPIDE_DIR := $(firstword \
$(call dir_if_exists,/usr/share/mpide) \ $(call dir_if_exists,/usr/share/mpide) \
@ -52,7 +54,6 @@ ifndef MPIDE_PREFERENCES_PATH
endif endif
endif endif
AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools
# The same as in Arduino, the Linux distribution contains avrdude and # 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 LDFLAGS += -T$(ARDUINO_CORE_PATH)/chipKIT-application-COMMON.ld
CPPFLAGS += -mno-smart-io -fno-short-double CPPFLAGS += -mno-smart-io -fno-short-double
CFLAGS_STD = CFLAGS_STD =
include $(ARDMK_DIR)/Arduino.mk