Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions mk/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ include mk/objects.mk
include mk/generatedcode.mk

$(BINDIR)/bpp: $(BPP_OBJS) $(FLEXBISON_GENERATED_OBJS) $(MAIN_OBJ)
$(CXX) $(CXXFLAGS) $(INCLUDEFLAGS) -o $@ $^
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^

$(BINDIR)/bpp-lsp: $(LSP_MAIN_OBJ) $(BPP_OBJS) $(FLEXBISON_GENERATED_OBJS) $(LSP_OBJS)
$(CXX) $(CXXFLAGS) $(INCLUDEFLAGS) -o $@ $^
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^

clean-bin:
@rm -f $(BINDIR)/bpp $(BINDIR)/bpp-lsp
Expand Down
10 changes: 7 additions & 3 deletions mk/config.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# C++ CONFIG
CXX := g++
CXXFLAGS := -std=gnu++23 -O2 -s -Wall -MMD -MP
INCLUDEFLAGS := -Isrc/
CXX ?= g++
CXXFLAGS ?= -O2 -s
# С++ required flags
CXXFLAGS += -std=gnu++23 -Wall -MMD -MP
# standard preprocessor and linker variables
CPPFLAGS ?=
CPPFLAGS += -Isrc/

# Can we parse debian/changelog?
PARSECHANGELOG := $(shell command -v dpkg-parsechangelog 2>/dev/null)
Expand Down
2 changes: 1 addition & 1 deletion mk/generatedcode.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $(FLEXBISON_GENERATED_STAMP): $(FLEXBISONDIR)/lexer.l $(FLEXBISONDIR)/parser.y

# LSP CLASSES GENERATION
$(LSP_OBJDIR)/generateLSPClasses: $(LSP_GENERATOR_OBJS)
$(CXX) $(CXXFLAGS) $(INCLUDEFLAGS) -o $@ $^
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^

$(LSP_GENERATED_STAMP): $(LSP_OBJDIR)/generateLSPClasses
@mkdir -p $(LSP_GENERATEDDIR)
Expand Down
4 changes: 2 additions & 2 deletions mk/objects.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
@mkdir -p $(dir $@)
$(CXX) $(CXXFLAGS) $(INCLUDEFLAGS) -c $< -o $@
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@

# The LSP generator is not part of the compiler itself.
# It's an intermediary tool that we use to generate classes for the LSP implementation
$(OBJDIR)/lsp/generator/%.o: $(SRCDIR)/lsp/generator/%.cpp $(LSPDIR)/metaModel.json
@mkdir -p $(dir $@)
$(CXX) $(CXXFLAGS) -c $< -o $@
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@

# Generated-code prerequisites
#
Expand Down