From: Clyne Sullivan <tullivan99@gmail.com>
Date: Mon, 9 May 2016 20:03:09 +0000 (-0400)
Subject: work on win32 build, removed pedantic
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=7227865bc1ffb16072a14effbfd8633635fc8ff5;p=clyne%2Fgamedev.git

work on win32 build, removed pedantic
---

diff --git a/Makefile b/Makefile
index d742643..929dc66 100644
--- 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