EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Correct the compilation of C++ files (prepared for the future)

Browse Source
This commit is contained in:
Frantisek Burian
2014-01-04 14:41:51 +01:00
parent f756c99a42
commit 39f6c9eb5f
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/Makefile.rules
View File

@@ -29,8 +29,10 @@ endif
PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
CPP = $(PREFIX)-g++ CXX = $(PREFIX)-g++
LD = $(PREFIX)-gcc LD = $(PREFIX)-gcc
AR = $(PREFIX)-ar
AS = $(PREFIX)-as
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb GDB = $(PREFIX)-gdb
@@ -75,11 +77,11 @@ CFLAGS += -I$(INCLUDE_DIR)
# C++ flags # C++ flags
CPPFLAGS += -Os -g $(ARCH_FLAGS) -MD $(DEFS) CXXFLAGS += -Os -g $(ARCH_FLAGS) -MD $(DEFS)
CPPFLAGS += -Wall -Wextra -Wimplicit-function-declaration CXXFLAGS += -Wall -Wextra -Wimplicit-function-declaration
CPPFLAGS += -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes CXXFLAGS += -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes
CPPFLAGS += -Wundef -Wshadow -fno-common CXXFLAGS += -Wundef -Wshadow -fno-common
CPPFLAGS += -I$(INCLUDE_DIR) CXXFLAGS += -I$(INCLUDE_DIR)
# Linker flags # Linker flags
@@ -130,11 +132,15 @@ flash: $(BINARY).flash
%.o: %.c %.o: %.c
@#printf " CC $(*).c\n" @#printf " CC $(*).c\n"
$(Q)$(CC) $(CFLAGS) -o $(*).o -c $(*).c $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $(*).o -c $(*).c
%.o: %.cxx
@#printf " CXX $(*).cxx\n"
$(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(*).o -c $(*).cxx
%.o: %.cpp %.o: %.cpp
@#printf " CPP $(*).cpp\n" @#printf " CXX $(*).cpp\n"
$(Q)$(CPP) $(CPPFLAGS) -o $(*).o -c $(*).cpp $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(*).o -c $(*).cpp
clean: clean:
@#printf " CLEAN\n" @#printf " CLEAN\n"