diff options
| -rw-r--r-- | arduino-mk/Arduino.mk | 37 | ||||
| -rw-r--r-- | arduino-mk/chipKIT.mk | 4 |
2 files changed, 18 insertions, 23 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 7c45bc5..6954b06 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -285,30 +285,27 @@ endif # Arduino Sketchbook folder # -ifndef ARDUINO_PREFERENCES_PATH - - AUTO_ARDUINO_PREFERENCES := $(firstword \ - $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \ - $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) ) - ifdef AUTO_ARDUINO_PREFERENCES - ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES) - $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED]) - else - echo $(error "ARDUINO_PREFERENCES is not defined") - endif - -else - $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[USER]) -endif ifndef ARDUINO_SKETCHBOOK - ifeq ($(ARDUINO_PREFERENCES_PATH),) - echo $(error No ARDUINO_PREFERENCES_PATH detected, cannot autodetect ARDUINO_SKETCHBOOK) + ifndef ARDUINO_PREFERENCES_PATH + + AUTO_ARDUINO_PREFERENCES := $(firstword \ + $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \ + $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) ) + ifdef AUTO_ARDUINO_PREFERENCES + ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES) + $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED]) + endif + + else + $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[USER]) endif - ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ - $(ARDUINO_PREFERENCES_PATH) | \ - sed -e 's/sketchbook.path=//' ) + ifneq ($(ARDUINO_PREFERENCES_PATH),) + ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ + $(ARDUINO_PREFERENCES_PATH) | \ + sed -e 's/sketchbook.path=//' ) + endif ifneq ($(ARDUINO_SKETCHBOOK),) $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(from arduino preferences file)) diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk index 3fb2097..ffcdf1b 100644 --- a/arduino-mk/chipKIT.mk +++ b/arduino-mk/chipKIT.mk @@ -62,8 +62,6 @@ ifndef MPIDE_PREFERENCES_PATH ifdef AUTO_MPIDE_PREFERENCES_PATH MPIDE_PREFERENCES_PATH = $(AUTO_MPIDE_PREFERENCES_PATH) $(call show_config_variable,MPIDE_PREFERENCES_PATH,[autodetected]) - else - echo $(error "MPIDE_PREFERENCES_PATH is not defined") endif endif @@ -89,7 +87,7 @@ OBJDUMP_NAME = pic32-objdump OBJCOPY_NAME = pic32-objcopy SIZE_NAME = pic32-size -LDSCRIPT = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) ldscript) +LDSCRIPT = $(call PARSE_BOARD,$(BOARD_TAG),ldscript) LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT) MCU_FLAG_NAME=mprocessor |