aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-01-02 08:49:45 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-01-02 08:49:45 +0000
commitf26d653e462a84bfa73387b66f5e651d5849695f (patch)
tree78d708986c619eabef58ff452b35a3fc15ec6f55 /demos
parent462ab6bcaffc7ee98c418f17abab1178beb83db1 (diff)
downloadChibiOS-f26d653e462a84bfa73387b66f5e651d5849695f.tar.gz
ChibiOS-f26d653e462a84bfa73387b66f5e651d5849695f.tar.bz2
ChibiOS-f26d653e462a84bfa73387b66f5e651d5849695f.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5011 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/ARMCM4-STM32F407-DISCOVERY-MEMS-G++/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS-G++/Makefile b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS-G++/Makefile
index dbbed56cd..80c926465 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS-G++/Makefile
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS-G++/Makefile
@@ -70,6 +70,7 @@ include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F4xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/os/various/cpp_wrappers/kernel.mk
include $(CHIBIOS)/test/test.mk
# Define linker script file here
@@ -92,7 +93,8 @@ CSRC = $(PORTSRC) \
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CPPSRC = $(CHIBIOS)/os/various/ch.cpp main.cpp
+CPPSRC = $(CHCPPSRC) \
+ main.cpp
# C sources to be compiled in ARM mode regardless of the global setting.
# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -119,6 +121,7 @@ ASMSRC = $(PORTASM)
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(CHCPPINC) \
$(CHIBIOS)/os/various/devices_lib/accel \
$(CHIBIOS)/os/various