diff options
| author | John Whittington <git@jbrengineering.co.uk> | 2020-08-06 19:21:23 +0200 |
|---|---|---|
| committer | John Whittington <git@jbrengineering.co.uk> | 2020-08-06 20:01:05 +0200 |
| commit | bf319c49b7f7ff17e073422a3ba06a701e12f590 (patch) | |
| tree | 66d05b1e87a9efcd27af2f485dc3cfae528b553d /examples/Blink3rdPartyLib | |
| parent | 185a1e9e3527794a49451915009fb48d9e678080 (diff) | |
platform neutral examples and manual cherry-pick merge of https://github.com/alissa-huskey/Arduino-Makefile/tree/test_fixes
Diffstat (limited to 'examples/Blink3rdPartyLib')
| -rw-r--r-- | examples/Blink3rdPartyLib/Makefile | 2 | ||||
| -rw-r--r-- | examples/Blink3rdPartyLib/Toggle/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/Blink3rdPartyLib/Makefile b/examples/Blink3rdPartyLib/Makefile index f473dbd..4658f50 100644 --- a/examples/Blink3rdPartyLib/Makefile +++ b/examples/Blink3rdPartyLib/Makefile @@ -15,7 +15,7 @@ TOGGLE_ARCHIVE = build-$(BOARD_TAG)/libtoggle.a CXXFLAGS += -IToggle OTHER_OBJS = Toggle/$(TOGGLE_ARCHIVE) -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk Toggle/$(TOGGLE_ARCHIVE): $(MAKE) -C Toggle $(TOGGLE_ARCHIVE) diff --git a/examples/Blink3rdPartyLib/Toggle/Makefile b/examples/Blink3rdPartyLib/Toggle/Makefile index a6234f6..d733171 100644 --- a/examples/Blink3rdPartyLib/Toggle/Makefile +++ b/examples/Blink3rdPartyLib/Toggle/Makefile @@ -8,7 +8,7 @@ # and archived into the build-$(BOARD_TAG)/libtoggle.a target. include ../board.mk -include ../../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk build-$(BOARD_TAG)/libtoggle.a: $(LOCAL_OBJS) $(AR) rcs $@ $(LOCAL_OBJS) |