rexy712/makefile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lib handling in exe_progress

Browse Source
This commit is contained in:
rexy712 2020-03-18 13:20:55 -07:00
parent d3071530bd
commit 6f12a031f5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makefile.exe_progress
View File

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