Browse Source

MinGW: Try build update for MinGW distro

LouYihua 7 years ago
parent
commit
1a48b13a27
2 changed files with 5 additions and 1 deletions
  1. 3 1
      win32/Makefile
  2. 2 0
      win32/Makefile.mingw

+ 3 - 1
win32/Makefile

@@ -21,7 +21,9 @@ override CCFLAGS += `sdl2-config --cflags` -g -msse2 -Wall -O2 -fno-strict-alias
 CXXFLAGS = $(CCFLAGS)
 CFLAGS = $(CCFLAGS) -std=gnu99
 # GCC v6 or higher has already defaults to gnu++14
-ifeq "$(GCCV6P)" "0"
+ifeq "$(GCCV6P)" "1"
+	CXXFLAGS += -std=gnu++14
+else
     CXXFLAGS += -std=c++11
 endif
 LDFLAGS = `sdl2-config --libs` -lm -lwinmm -lole32 -loleaut32 -limm32 -lcomctl32 -luuid -ldxguid -lversion -static -static-libgcc -static-libstdc++

+ 2 - 0
win32/Makefile.mingw

@@ -22,6 +22,8 @@ CXXFLAGS = $(CCFLAGS)
 CFLAGS = $(CCFLAGS) -std=gnu99
 # GCC v6 or higher has already defaults to gnu++14
 ifeq "$(GCCV6P)" "0"
+	CXXFLAGS += -std=gnu++14
+else
     CXXFLAGS += -std=c++11
 endif
 LDFLAGS = -lmingw32 -lSDL2main -lSDL2 -mwindows -lm -lwinmm -lole32 -loleaut32 -limm32 -lcomctl32 -luuid -ldxguid -lversion -static -static-libgcc -static-libstdc++