diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-01-02 08:49:45 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-01-02 08:49:45 +0000 |
| commit | f26d653e462a84bfa73387b66f5e651d5849695f (patch) | |
| tree | 78d708986c619eabef58ff452b35a3fc15ec6f55 | |
| parent | 462ab6bcaffc7ee98c418f17abab1178beb83db1 (diff) | |
| download | ChibiOS-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
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY-MEMS-G++/Makefile | 5 | ||||
| -rw-r--r-- | os/various/cpp_wrappers/ch.cpp (renamed from os/various/ch.cpp) | 0 | ||||
| -rw-r--r-- | os/various/cpp_wrappers/ch.hpp (renamed from os/various/ch.hpp) | 0 | ||||
| -rw-r--r-- | os/various/cpp_wrappers/kernel.mk | 4 | ||||
| -rw-r--r-- | os/various/fatfs_bindings/fatfs.mk | 2 |
5 files changed, 9 insertions, 2 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
diff --git a/os/various/ch.cpp b/os/various/cpp_wrappers/ch.cpp index 84678349c..84678349c 100644 --- a/os/various/ch.cpp +++ b/os/various/cpp_wrappers/ch.cpp diff --git a/os/various/ch.hpp b/os/various/cpp_wrappers/ch.hpp index ad3dd18af..ad3dd18af 100644 --- a/os/various/ch.hpp +++ b/os/various/cpp_wrappers/ch.hpp diff --git a/os/various/cpp_wrappers/kernel.mk b/os/various/cpp_wrappers/kernel.mk new file mode 100644 index 000000000..6cd787658 --- /dev/null +++ b/os/various/cpp_wrappers/kernel.mk @@ -0,0 +1,4 @@ +# C++ wrapper files.
+CHCPPSRC = ${CHIBIOS}/os/various/cpp_wrappers/ch.cpp
+
+CHCPPINC = ${CHIBIOS}/os/various/cpp_wrappers
diff --git a/os/various/fatfs_bindings/fatfs.mk b/os/various/fatfs_bindings/fatfs.mk index 1bbdc254f..682091e00 100644 --- a/os/various/fatfs_bindings/fatfs.mk +++ b/os/various/fatfs_bindings/fatfs.mk @@ -2,6 +2,6 @@ FATFSSRC = ${CHIBIOS}/os/various/fatfs_bindings/fatfs_diskio.c \
${CHIBIOS}/os/various/fatfs_bindings/fatfs_syscall.c \
${CHIBIOS}/ext/fatfs/src/ff.c \
- ${CHIBIOS}/ext/fatfs/src/option/ccsbcs.c \
+ ${CHIBIOS}/ext/fatfs/src/option/ccsbcs.c
FATFSINC = ${CHIBIOS}/ext/fatfs/src
|