diff --git a/Makefile.conf b/Makefile.conf index 6c8e93d..68f6663 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -12,6 +12,7 @@ DEBUG=1 PREFIX?=$(HOME) ENGINE_LIB_PATH=$(PREFIX)/lib ENGINE_INC_PATH=$(PREFIX)/include +LANG_VERSION=c++14 CXXFLAGS+=-fPIC @@ -28,19 +29,14 @@ endif ######### Overrides ######### -include $(HERE)local.conf +CXXFLAGS+=-std=$(LANG_VERSION) + ifeq ($(DEBUG),1) CXXFLAGS+=-g -O0 else CXXFLAGS+=-DNDEBUG=1 -O3 endif -ifdef $(LANG_VERSION) -CXXFLAGS+=-std=$(LANG_VERSION) -else -CXXFLAGS+=-std=c++14 -endif - - # Add -L Prefixes to LIB/INC paths, # if not already explicitly set in local.conf ifndef ENGINE_LIB diff --git a/local.conf.example b/local.conf.example index 4fdb937..1e38464 100644 --- a/local.conf.example +++ b/local.conf.example @@ -6,6 +6,7 @@ ######### C++ Compiler ######### # Should work with clang and g++ # CXX=g++ +# LANG_VERSION=c++14 # DEBUG=1 # DEBUG Build (Default) # DEBUG=0 # RELEASE Build