work on win32 build, removed pedantic

diff --git a/Makefile b/Makefile
index d742643c7094daa5bae984c5b6f6a71e9d6a5271..929dc66257ad1ee28085dacad2964717807e6b51 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ ifeq ($(TARGET_OS),win32)
               -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
 endif
 
-CXXFLAGS = -g -m$(TARGET_BITS) -std=c++1z
+CXXFLAGS = -g -m$(TARGET_BITS) -std=c++14
 CXXINC   = -Iinclude -Iinclude/freetype
-CXXWARN  = -Wall -Wextra -Werror -pedantic-errors
+CXXWARN  = -Wall -Wextra -Werror #-pedantic-errors
 
 CXXSRCDIR = src
 CXXOUTDIR = out