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

Merge pull request #331 from sej7278/master

Browse source 
Added BOARD_SUB to OBJDIR
This commit is contained in:
Sudar Muthu 2015-03-27 08:54:43 +05:30
commit ab06829172
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Arduino.mk
View file

@ -688,6 +688,9 @@ endif
# Everything gets built in here (include BOARD_TAG now) # Everything gets built in here (include BOARD_TAG now)
ifndef OBJDIR ifndef OBJDIR
OBJDIR = build-$(BOARD_TAG) OBJDIR = build-$(BOARD_TAG)
ifdef BOARD_SUB
OBJDIR = build-$(BOARD_TAG)-$(BOARD_SUB)
endif
$(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG)) $(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG))
else else
$(call show_config_variable,OBJDIR,[USER]) $(call show_config_variable,OBJDIR,[USER])

1
HISTORY.md
View file

@ -29,6 +29,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Tweak: Replace CXX_NAME with CXX as per the Emacs Flymake Wiki (Issue #309) (https://github.com/sej7278) - Tweak: Replace CXX_NAME with CXX as per the Emacs Flymake Wiki (Issue #309) (https://github.com/sej7278)
- Tweak: Ability to override `USB_TYPE` in Teensy.md (Issue #313) (https://github.com/Poofjunior) - Tweak: Ability to override `USB_TYPE` in Teensy.md (Issue #313) (https://github.com/Poofjunior)
- Tweak: Integration instructions for CodeBlocks IDE (Issue #321) (https://github.com/fbielejec) - Tweak: Integration instructions for CodeBlocks IDE (Issue #321) (https://github.com/fbielejec)
- Tweak: Add BOARD_SUB to OBJDIR if defined in 1.5+ (https://github.com/sej7278)
- Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans) - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans)
- Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas) - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)