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

Merge branch 'master' of https://github.com/sudar/Arduino-Makefile into update

Browse source
This commit is contained in:
ladislas 2014-08-18 23:27:01 +02:00
commit 58f303a5d3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino.mk
View file

@ -1333,7 +1333,7 @@ ifneq ($(strip $(AVRDUDE_ISP_FUSES_POST)),)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_FUSES_POST) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_FUSES_POST)
endif endif
clean: clean::
$(REMOVE) $(OBJDIR) $(REMOVE) $(OBJDIR)
size: $(TARGET_HEX) size: $(TARGET_HEX)

4
HISTORY.md
View file

@ -12,10 +12,10 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Add: Add information about overriding system libs (Issue #229). (https://github.com/sej7278) - Add: Add information about overriding system libs (Issue #229). (https://github.com/sej7278)
- Add: Add information about reporting bugs to the correct project (Issue #231). (https://github.com/sej7278) - Add: Add information about reporting bugs to the correct project (Issue #231). (https://github.com/sej7278)
- Fix: Allow the use of CFLAGS_STD and CXXFLAGS_STD and set defaults (Issue #234) (https://github.com/ladislas) - Fix: Allow the use of CFLAGS_STD and CXXFLAGS_STD and set defaults (Issue #234) (https://github.com/ladislas)
- Tweak: Remove \$(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas) - Tweak: Remove $(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas)
- Add: Add documentation about CFLAGS_STD and CXXFLAGS_STD (Issue #234) (https://github.com/ladislas) - Add: Add documentation about CFLAGS_STD and CXXFLAGS_STD (Issue #234) (https://github.com/ladislas)
- Tweak: Update Malefile-example.mk with STD flags (https://github.com/ladislas) - Tweak: Update Malefile-example.mk with STD flags (https://github.com/ladislas)
- Add: Allow "make clean" target to be extended (Issue #239). (https://github.com/sej7278)
### 1.3.4 (2014-07-12) ### 1.3.4 (2014-07-12)
- Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)

2
examples/MakefileExample/Makefile-example.mk
View file

@ -36,7 +36,7 @@ MONITOR_BAUDRATE = 115200
### On OS X with `homebrew`: ### On OS X with `homebrew`:
AVR_TOOLS_DIR = /usr/local AVR_TOOLS_DIR = /usr/local
### or on Linux: (remove the one you don't want) ### or on Linux: (remove the one you don't want)
AVR_TOOLS_DIR = /usr/bin AVR_TOOLS_DIR = /usr
### AVRDDUDE ### AVRDDUDE
### Path to avrdude directory. ### Path to avrdude directory.