From 2d2cc6c57459a673fc9b3a2adaa73bbfa884d3b1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 1 Jun 2015 13:02:18 +1000
Subject: [PATCH] build: fixed flymaple build

---
 mk/board_avr.mk      | 3 +++
 mk/board_flymaple.mk | 3 +++
 mk/board_native.mk   | 3 +++
 mk/build_rules.mk    | 2 --
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mk/board_avr.mk b/mk/board_avr.mk
index 505aa92bab..6ef8fc0119 100644
--- a/mk/board_avr.mk
+++ b/mk/board_avr.mk
@@ -191,4 +191,7 @@ $(SKETCHEEP):	$(SKETCHELF)
 	$(RULEHDR)
 	$(v)$(OBJCOPY) -O ihex -j.eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $@
 
+SKETCH_INCLUDES	= $(SKETCHLIBINCLUDES)
+SLIB_INCLUDES	=	-I$(dir $<)/utility $(SKETCHLIBINCLUDES)
+
 include $(MK_DIR)/build_rules.mk
diff --git a/mk/board_flymaple.mk b/mk/board_flymaple.mk
index 749d2a1147..9e9c3f9485 100644
--- a/mk/board_flymaple.mk
+++ b/mk/board_flymaple.mk
@@ -175,4 +175,7 @@ $(SKETCHEEP):	$(SKETCHELF)
 	$(RULEHDR)
 	$(v)$(OBJCOPY) -O ihex -j.eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $@
 
+SKETCH_INCLUDES        =       $(SKETCHLIBINCLUDES) $(ARDUINOLIBINCLUDES) $(COREINCLUDES)
+SLIB_INCLUDES  =       -I$(dir $<)/utility $(SKETCHLIBINCLUDES) $(ARDUINOLIBINCLUDES) $(COREINCLUDES)
+
 include $(MK_DIR)/build_rules.mk
diff --git a/mk/board_native.mk b/mk/board_native.mk
index ca8a4597fe..aedd755fc6 100644
--- a/mk/board_native.mk
+++ b/mk/board_native.mk
@@ -102,4 +102,7 @@ $(SKETCHELF): $(SKETCHOBJS) $(LIBOBJS)
 	$(v)cp $(SKETCHELF) .
 	@echo "Firmware is in $(BUILDELF)"
 
+SKETCH_INCLUDES	=	$(SKETCHLIBINCLUDES)
+SLIB_INCLUDES	=	-I$(dir $<)/utility $(SKETCHLIBINCLUDES)
+
 include $(MK_DIR)/build_rules.mk
diff --git a/mk/build_rules.mk b/mk/build_rules.mk
index 58233f967d..08fe05d9a0 100644
--- a/mk/build_rules.mk
+++ b/mk/build_rules.mk
@@ -2,7 +2,6 @@
 #
 # Build sketch objects
 #
-SKETCH_INCLUDES	=	$(SKETCHLIBINCLUDES)
 
 $(BUILDROOT)/%.o: $(BUILDROOT)/%.cpp
 	$(RULEHDR)
@@ -23,7 +22,6 @@ $(BUILDROOT)/%.o: $(SRCROOT)/%.S
 #
 # Build library objects from sources in the sketchbook
 #
-SLIB_INCLUDES	=	-I$(dir $<)/utility $(SKETCHLIBINCLUDES)
 
 $(BUILDROOT)/libraries/%.o: $(SKETCHBOOK)/libraries/%.cpp
 	$(RULEHDR)