diff --git a/makefile.exe_progress b/makefile.exe_progress index 5ac1fc1..1b79bf8 100644 --- a/makefile.exe_progress +++ b/makefile.exe_progress @@ -23,10 +23,10 @@ SOURCE_DIRS::=src SOURCES::= OBJDIR::=obj DEPDIR::=$(OBJDIR)/dep -LIBDIR::=lib +LIBDIRS::=lib INCLUDE_DIRS::=include -CFLAGS::=-g -std=c18 -Wall -pedantic -Wextra -CXXFLAGS::=-g -std=c++17 -Wall -pedantic -Wextra +CFLAGS::=-std=c18 -Wall -pedantic -Wextra +CXXFLAGS::=-std=c++17 -Wall -pedantic -Wextra EXT::=cpp LANG::=$(EXT) MAIN_EXECUTABLE::=tester @@ -122,10 +122,12 @@ endif #add dependency tracking and include directories INTERNAL_COMPILERFLAGS=-c $(foreach dir,$(INCLUDE_DIRS),-I"$(dir)") -MMD -MP -MF"$(DEPDIR)/$(notdir $(patsubst %.o,%.d,$@))" +INTERNAL_LINKFLAGS=$(foreach dir,$(LIBDIRS),-L"$(dir)") THIS_MAKEFILE_NAME::=$(lastword $(MAKEFILE_LIST)) INTERNAL_SOURCES::=$(SOURCES) $(foreach source,$(SOURCE_DIRS),$(foreach ext,$(EXT),$(wildcard $(source)/*.$(ext)))) OBJECTS::=$(addprefix $(OBJDIR)/,$(subst \,.,$(subst /,.,$(addsuffix .o,$(INTERNAL_SOURCES))))) ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS) +ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) ifeq ($(VERBOSE),1) SILENCER::= else @@ -180,7 +182,7 @@ do_strip: #Link executable $(MAIN_EXECUTABLE): $(OBJECTS) @$(call PRINT_PERCENT,Linking $@) - $(SILENCER)$(COMPILER) $(LDFLAGS) $^ -o "$(basename $@)" $(LDLIBS) + $(SILENCER)$(COMPILER) $^ -o "$(basename $@)" $(ALL_LINKFLAGS) $(LDLIBS) #Object target recipe define GENERATE_OBJECTS