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

line numbers reported by gcc on ino files are off by one, automaticaly identifiy libries like the ide

Browse source
This commit is contained in:
Scott Howard 2013-03-12 11:18:46 -04:00
parent 184230fcf2
commit 72e0768af0
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arduino-mk/Arduino.mk
View file

@ -90,6 +90,12 @@
# - Added support for USB_PID/VID used by the Leonardo (ex Dan # - Added support for USB_PID/VID used by the Leonardo (ex Dan
# Villiom Podlaski Christiansen and Marc Plano-Lesay). # Villiom Podlaski Christiansen and Marc Plano-Lesay).
# #
# 0.11 3.x.2013 Ben Hildred
# - Fixed off by one problem on line numbers
# in error messages.
# - Basic autodetection of libraries.
#
#
######################################################################## ########################################################################
# #
# PATHS YOU NEED TO SET UP # PATHS YOU NEED TO SET UP
@ -490,7 +496,12 @@ TARGETS = $(OBJDIR)/$(TARGET).*
CORE_LIB = $(OBJDIR)/libcore.a CORE_LIB = $(OBJDIR)/libcore.a
# A list of dependencies # A list of dependencies
DEP_FILE = $(OBJDIR)/depends.mk DEP_FILE = $(OBJDIR)/depends.mk
LIB_DEP_FILE = $(OBJDIR)/libdep.mk
ifndef ARDUINO_LIBS
include $(LIB_DEP_FILE)
endif
# Names of executables # Names of executables
CC = $(AVR_TOOLS_PATH)/avr-gcc CC = $(AVR_TOOLS_PATH)/avr-gcc
@ -594,11 +605,13 @@ $(OBJDIR)/%.d: %.s
# the pde -> cpp -> o file # the pde -> cpp -> o file
$(OBJDIR)/%.cpp: %.pde $(OBJDIR)/%.cpp: %.pde
$(ECHO) '#include "WProgram.h"' > $@ $(ECHO) '#include "WProgram.h"' > $@
$(ECHO) '#line 1' \"$<\" >> $@
$(CAT) $< >> $@ $(CAT) $< >> $@
# the ino -> cpp -> o file # the ino -> cpp -> o file
$(OBJDIR)/%.cpp: %.ino $(OBJDIR)/%.cpp: %.ino
$(ECHO) '#include <Arduino.h>' > $@ $(ECHO) '#include <Arduino.h>' > $@
$(ECHO) '#line 1' \"$<\" >> $@
$(CAT) $< >> $@ $(CAT) $< >> $@
$(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(OBJDIR)/%.o: $(OBJDIR)/%.cpp
@ -666,6 +679,10 @@ $(TARGET_ELF): $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS)
$(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS) $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
$(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS) $(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
$(LIB_DEP_FILE): $(OBJDIR) *.ino *.cpp *.c *.h *.pde
grep -h '^[ ]*#[ ]*include[ ]*<' -- *.ino *.cpp *.c *.h *.pde|sed 's!^.*<\(.*\)\.h>.*!\1!'|sort -u|xargs -d '\n' echo 'ARDUINO_LIBS =' > $(LIB_DEP_FILE)
echo >> $(LIB_DEP_FILE)
$(DEP_FILE): $(OBJDIR) $(DEPS) $(DEP_FILE): $(OBJDIR) $(DEPS)
cat $(DEPS) > $(DEP_FILE) cat $(DEPS) > $(DEP_FILE)