diff --git a/make_templates/static_lib b/make_templates/static_lib index a667b0e2617f4afd59fbd90a53d04f1d05bf03b1..4ea31429fcc8b73aa1200b8cf6ce5a444b66a34d 100644 --- a/make_templates/static_lib +++ b/make_templates/static_lib @@ -1,4 +1,6 @@ -CPPFLAGS += --std=c++1z +CPPSTD ?= --std=c++1z +CPPFLAGS += $(CPPSTD) + override CPPFLAGS += -MMD -MP override CPPFLAGS += -I./include override CPPFLAGS += $(shell cat .cxxflags 2> /dev/null | xargs) @@ -44,7 +46,7 @@ OUT := $(DISTDIR)/$(TARGET) ifeq ($(origin HEADERS), undefined) HEADERS := $(shell find -wholename "$(SRCDIR)/*.hpp" && find -wholename "$(SRCDIR)/*.h") endif -INCLUDE := $(HEADERS:$(SRCDIR)/%=$(INCDIR)/%) +INCLUDE := $(ADD_INCLUDE:%=$(INCDIR)/%) $(HEADERS:$(SRCDIR)/%=$(INCDIR)/%) INCDIRS := $(shell dirname $(INCLUDE)) ifeq ($(origin SOURCES), undefined)