From 3cc7a13d9d863982b10937960fb9e98313409719 Mon Sep 17 00:00:00 2001 From: namark <namark@disroot.org> Date: Thu, 18 Apr 2019 01:49:17 +0400 Subject: [PATCH] A couple of more static_lib customization options. --- make_templates/static_lib | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make_templates/static_lib b/make_templates/static_lib index a667b0e..4ea3142 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) -- GitLab