aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-05-09 16:03:09 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-05-09 16:03:09 -0400
commit7227865bc1ffb16072a14effbfd8633635fc8ff5 (patch)
tree9caae1a8657ae0e11bd73caab312f463b513e93f
parent50bfb70e9a1788e6f64800001919e3d8386eb81d (diff)
work on win32 build, removed pedantic
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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