rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Merged in alessiomorale/librepilot/amorale/LP-238_cpp_makefiles_fixes (pull request #180)

Browse Source 
LP-238 - Move CPP stuffs within apps/boot-defs.mk. fix targets accordingly
This commit is contained in:
Lalanne Laurent 2016-02-20 13:20:49 +01:00
commit 85050f63ff
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/make/apps-defs.mk
View File

@ -132,6 +132,11 @@ SRC += $(MATHLIB)/butterworth.c
SRC += $(FLIGHTLIB)/printf-stdarg.c SRC += $(FLIGHTLIB)/printf-stdarg.c
SRC += $(FLIGHTLIB)/optypes.c SRC += $(FLIGHTLIB)/optypes.c
## CPP support
ifeq ($(USE_CXX),YES)
CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
endif
## Modules ## Modules
SRC += $(foreach mod, $(MODULES), $(sort $(wildcard $(OPMODULEDIR)/$(mod)/*.c))) SRC += $(foreach mod, $(MODULES), $(sort $(wildcard $(OPMODULEDIR)/$(mod)/*.c)))
CPPSRC += $(foreach mod, $(MODULES), $(sort $(wildcard $(OPMODULEDIR)/$(mod)/*.cpp))) CPPSRC += $(foreach mod, $(MODULES), $(sort $(wildcard $(OPMODULEDIR)/$(mod)/*.cpp)))

5
flight/make/boot-defs.mk
View File

@ -67,6 +67,11 @@ SRC += $(PIOSCOMMON)/pios_led.c
SRC += $(FLIGHTLIB)/op_dfu.c SRC += $(FLIGHTLIB)/op_dfu.c
SRC += $(FLIGHTLIB)/printf-stdarg.c SRC += $(FLIGHTLIB)/printf-stdarg.c
## CPP support
ifeq ($(USE_CXX),YES)
CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
endif
# List C source files here which must be compiled in ARM-Mode (no -mthumb). # List C source files here which must be compiled in ARM-Mode (no -mthumb).
# Use file-extension c for "c-only"-files # Use file-extension c for "c-only"-files
SRCARM += SRCARM +=

1
flight/targets/boards/discoveryf4bare/firmware/Makefile
View File

@ -97,7 +97,6 @@ ifndef TESTAPP
SRC += $(FLIGHTLIB)/insgps13state.c SRC += $(FLIGHTLIB)/insgps13state.c
SRC += $(FLIGHTLIB)/auxmagsupport.c SRC += $(FLIGHTLIB)/auxmagsupport.c
SRC += $(FLIGHTLIB)/lednotification.c SRC += $(FLIGHTLIB)/lednotification.c
CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
## UAVObjects ## UAVObjects
include ./UAVObjects.inc include ./UAVObjects.inc

1
flight/targets/boards/revolution/firmware/Makefile
View File

@ -95,7 +95,6 @@ ifndef TESTAPP
SRC += $(FLIGHTLIB)/auxmagsupport.c SRC += $(FLIGHTLIB)/auxmagsupport.c
SRC += $(FLIGHTLIB)/lednotification.c SRC += $(FLIGHTLIB)/lednotification.c
SRC += $(FLIGHTLIB)/sha1.c SRC += $(FLIGHTLIB)/sha1.c
CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
## UAVObjects ## UAVObjects
include ./UAVObjects.inc include ./UAVObjects.inc

1
flight/targets/boards/revonano/firmware/Makefile
View File

@ -91,7 +91,6 @@ ifndef TESTAPP
SRC += $(FLIGHTLIB)/plans.c SRC += $(FLIGHTLIB)/plans.c
SRC += $(FLIGHTLIB)/WorldMagModel.c SRC += $(FLIGHTLIB)/WorldMagModel.c
SRC += $(FLIGHTLIB)/insgps13state.c SRC += $(FLIGHTLIB)/insgps13state.c
CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
SRC += $(FLIGHTLIB)/lednotification.c SRC += $(FLIGHTLIB)/lednotification.c
SRC += $(FLIGHTLIB)/auxmagsupport.c SRC += $(FLIGHTLIB)/auxmagsupport.c
## UAVObjects ## UAVObjects

2
flight/targets/boards/revoproto/firmware/Makefile
View File

@ -90,8 +90,6 @@ ifndef TESTAPP
SRC += $(FLIGHTLIB)/WorldMagModel.c SRC += $(FLIGHTLIB)/WorldMagModel.c
SRC += $(FLIGHTLIB)/insgps13state.c SRC += $(FLIGHTLIB)/insgps13state.c
SRC += $(FLIGHTLIB)/auxmagsupport.c SRC += $(FLIGHTLIB)/auxmagsupport.c
CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
## UAVObjects ## UAVObjects
include ./UAVObjects.inc include ./UAVObjects.inc