Skip to content

Build: Core/Makefile - support c++ sources with suffix '.cc' or let t… #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HeckHeckHeckHeck wants to merge 2 commits into from
Closed

Build: Core/Makefile - support c++ sources with suffix '.cc' or let t… #645

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc7d32
Build: Core/Makefile - support c++ sources with suffix '.cc' or let t…
HeckHeckHeckHeck Sep 23, 2024
fa5d4a1
Merge remote-tracking branch 'upstream/master' into build_user_src_su…
HeckHeckHeckHeck Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,21 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
#######################################
# build the application
#######################################
USER_SUFFIX_CXX ?= .cc

# split c++ sources into suffix .cpp and user suffix
CXX_SOURCES_SUFFIX_USER=$(filter %$(USER_SUFFIX_CXX), $(CPP_SOURCES))
CXX_SOURCES_SUFFIX_CPP=$(filter %.cpp, $(CPP_SOURCES))
# list of objects
# .c files
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
vpath %.c $(sort $(dir $(C_SOURCES)))
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CPP_SOURCES:.cpp=.o)))
vpath %.cpp $(sort $(dir $(CPP_SOURCES)))
# c++ files with .cpp suffix
OBJECTS += $(filter .cpp, addprefix $(BUILD_DIR)/,$(notdir $(CXX_SOURCES_SUFFIX_CPP:.cpp=.o)))
vpath %.cpp $(sort $(dir $(CXX_SOURCES_SUFFIX_CPP)))
# c++ files with user suffix
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CXX_SOURCES_SUFFIX_USER:$(USER_SUFFIX_CXX)=.o)))
vpath %$(USER_SUFFIX_CXX) $(sort $(dir $(CXX_SOURCES_SUFFIX_USER)))
# list of ASM program objects
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
vpath %.s $(sort $(dir $(ASM_SOURCES)))
Expand All @@ -285,6 +295,9 @@ $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
$(BUILD_DIR)/%.o: %.cpp Makefile | $(BUILD_DIR)
$(CXX) -c $(CPPFLAGS) $(CPP_STANDARD) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.cpp=.lst)) $< -o $@

$(BUILD_DIR)/%.o: %$(USER_SUFFIX_CXX) Makefile | $(BUILD_DIR)
$(CXX) -c $(CPPFLAGS) $(CPP_STANDARD) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:$(USER_CXX_SUFFIX)=.lst)) $< -o $@

$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
$(AS) -c $(ASFLAGS) $< -o $@

Expand Down