aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fixed flymaple build

Browse Source
This commit is contained in:
Andrew Tridgell 2015-06-01 13:02:18 +10:00
parent 074a6cad91
commit 2d2cc6c574
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/board_avr.mk
View File

@ -191,4 +191,7 @@ $(SKETCHEEP): $(SKETCHELF)
$(RULEHDR) $(RULEHDR)
$(v)$(OBJCOPY) -O ihex -j.eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $@ $(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 include $(MK_DIR)/build_rules.mk

3
mk/board_flymaple.mk
View File

@ -175,4 +175,7 @@ $(SKETCHEEP): $(SKETCHELF)
$(RULEHDR) $(RULEHDR)
$(v)$(OBJCOPY) -O ihex -j.eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $@ $(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 include $(MK_DIR)/build_rules.mk

3
mk/board_native.mk
View File

@ -102,4 +102,7 @@ $(SKETCHELF): $(SKETCHOBJS) $(LIBOBJS)
$(v)cp $(SKETCHELF) . $(v)cp $(SKETCHELF) .
@echo "Firmware is in $(BUILDELF)" @echo "Firmware is in $(BUILDELF)"
SKETCH_INCLUDES = $(SKETCHLIBINCLUDES)
SLIB_INCLUDES = -I$(dir $<)/utility $(SKETCHLIBINCLUDES)
include $(MK_DIR)/build_rules.mk include $(MK_DIR)/build_rules.mk

2
mk/build_rules.mk
View File

@ -2,7 +2,6 @@
# #
# Build sketch objects # Build sketch objects
# #
SKETCH_INCLUDES = $(SKETCHLIBINCLUDES)
$(BUILDROOT)/%.o: $(BUILDROOT)/%.cpp $(BUILDROOT)/%.o: $(BUILDROOT)/%.cpp
$(RULEHDR) $(RULEHDR)
@ -23,7 +22,6 @@ $(BUILDROOT)/%.o: $(SRCROOT)/%.S
# #
# Build library objects from sources in the sketchbook # Build library objects from sources in the sketchbook
# #
SLIB_INCLUDES = -I$(dir $<)/utility $(SKETCHLIBINCLUDES)
$(BUILDROOT)/libraries/%.o: $(SKETCHBOOK)/libraries/%.cpp $(BUILDROOT)/libraries/%.o: $(SKETCHBOOK)/libraries/%.cpp
$(RULEHDR) $(RULEHDR)