Merge remote-tracking branch 'refs/remotes/origin/master'

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

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