From 82dbb7dfa46217f4b252717478d0486212e2e3e7 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 7 Mar 2016 09:54:27 +1100
Subject: To avoid failures with MinGW 4.9 switch language standard from c++0x
 to gnu++0x. MinGW 4.9 doesn't install a copy of gcc as cc.exe so explicitly
 set CC=gcc.

---
 gtk/makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gtk/makefile')

diff --git a/gtk/makefile b/gtk/makefile
index f9086fa34..ca8d7c656 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -37,6 +37,7 @@ PICFLAGS = -fPIC
 endif
 
 ifdef windir
+CC = gcc
 DEL = del /q
 COMPLIB=..\bin\scintilla.a
 else
@@ -74,7 +75,7 @@ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
 endif
 
 CFLAGS:=$(CTFLAGS)
-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
+CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
 
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
-- 
cgit v1.2.3