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

Show original line number for error messages

Browse source
This commit is contained in:
Adam Dunlap 2012-08-17 11:50:05 -07:00 committed by Sudar
parent 3afe25ba5a
commit 9ebae306d0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -118,6 +118,7 @@ The following are the list of changes that I have made or merged in this fork. H
### 0.10.2 15.xii.2012 Sudar ### 0.10.2 15.xii.2012 Sudar
- Added sketch size verification. (https://github.com/fornellas) - Added sketch size verification. (https://github.com/fornellas)
- Show original line number for error messages (https://github.com/WizenedEE)
## Know Issues ## Know Issues
- Because of the way the makefile is structured, the configuration parameters gets printed twice. - Because of the way the makefile is structured, the configuration parameters gets printed twice.

5
arduino-mk/Arduino.mk
View file

@ -143,6 +143,7 @@
# #
# 0.10.2 15.xii.2012 Sudar # 0.10.2 15.xii.2012 Sudar
# - Added sketch size verification. (https://github.com/fornellas) # - Added sketch size verification. (https://github.com/fornellas)
# - Show original line number for error messages (https://github.com/WizenedEE)
# #
######################################################################## ########################################################################
# #
@ -812,12 +813,12 @@ $(OBJDIR)/%.d: %.s $(COMMON_DEPS)
# We should check for Arduino version, if the file is .pde because a .pde file might be used in Arduino 1.0 # We should check for Arduino version, if the file is .pde because a .pde file might be used in Arduino 1.0
# the pde -> cpp -> o file # the pde -> cpp -> o file
$(OBJDIR)/%.cpp: %.pde $(COMMON_DEPS) $(OBJDIR)/%.cpp: %.pde $(COMMON_DEPS)
$(ECHO) '#if ARDUINO >= 100\n #include "Arduino.h"\n#else\n #include "WProgram.h"\n#endif' > $@ $(ECHO) '#if ARDUINO >= 100\n #include "Arduino.h"\n#else\n #include "WProgram.h"\n#endif\n#line 1' > $@
$(CAT) $< >> $@ $(CAT) $< >> $@
# the ino -> cpp -> o file # the ino -> cpp -> o file
$(OBJDIR)/%.cpp: %.ino $(COMMON_DEPS) $(OBJDIR)/%.cpp: %.ino $(COMMON_DEPS)
$(ECHO) '#include <Arduino.h>' > $@ $(ECHO) '#include <Arduino.h>\n#line 1' > $@
$(CAT) $< >> $@ $(CAT) $< >> $@
$(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(COMMON_DEPS) $(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(COMMON_DEPS)