diff options
| author | Simon John <git@the-jedi.co.uk> | 2018-01-12 19:27:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 19:27:14 +0000 |
| commit | 74e1ef00fd824e07ebbc5254465a4a9e87514eaa (patch) | |
| tree | 342fd8732f1220e40ef423fff1be8c81f032af92 /Arduino.mk | |
| parent | c3fe5dcc2fbd5c895b032ca5a5a1f60af163b744 (diff) | |
| parent | a6d979ef90ddae3549876917f80847ea647c284a (diff) | |
Merge pull request #530 from tuna-f1sh/master
ardmk-init - Makefile initialisation and template project utility
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1443,7 +1443,7 @@ endif AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE) ifndef $(ISP_PORT) - ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny gpio linuxgpio avrispmkii dragon_isp dragon_dw)) + ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), atmelice_isp usbasp usbtiny gpio linuxgpio avrispmkii dragon_isp dragon_dw)) AVRDUDE_ISP_OPTS += -P $(call get_isp_port) endif else @@ -1605,7 +1605,7 @@ ifneq ($(words $(wildcard $(TAGS_FILE))), 0) rm -f $(TAGS_FILE) endif @$(ECHO) "Generating tags for local sources (INO an PDE files as C++): " - $(CTAGS_CMD) $(TAGS_FILE) --langmap=c++:.ino --langmap=c++:.pde $(LOCAL_SRCS) + $(CTAGS_CMD) $(TAGS_FILE) --langmap=c++:+.ino.pde $(LOCAL_SRCS) ifneq ($(words $(ARDUINO_LIBS)), 0) @$(ECHO) "Generating tags for project libraries: " $(CTAGS_CMD) $(TAGS_FILE) $(foreach lib, $(ARDUINO_LIBS),$(USER_LIB_PATH)/$(lib)/*) |