From 2603f1e2074b0f880886b533ffc47ecef4fd33f7 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 2 Oct 2014 18:17:13 +1000
Subject: Allow using C++11 <regex> for searches as a provisional feature.

---
 win32/makefile      | 6 +++++-
 win32/scintilla.mak | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/makefile b/win32/makefile
index 299c3c32c..bd808fe41 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -27,6 +27,10 @@ endif
 
 CXXBASEFLAGS=--std=c++0x -Wall -pedantic $(INCLUDEDIRS) -fno-rtti $(D2DFLAGS)
 
+ifdef CXX11_REGEX
+REFLAGS=-DCXX11_REGEX
+endif
+
 ifdef DEBUG
 CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
 else
@@ -35,7 +39,7 @@ STRIPFLAG=-s
 endif
 
 .cxx.o:
-	$(CXX) $(CXXFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) $(REFLAGS) -c $<
 
 ALL:	$(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) ScintillaWinS.o
 
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index aef73f572..43679cbc7 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -39,6 +39,10 @@ CXXFLAGS=$(CXXFLAGS) -DDISABLE_D2D
 !MESSAGE Direct2D is not available
 !ENDIF
 
+!IFDEF CXX11_REGEX
+CXXFLAGS=$(CXXFLAGS) -DCXX11_REGEX
+!ENDIF
+
 !IFDEF DEBUG
 CXXFLAGS=$(CXXFLAGS) $(CXXDEBUG)
 LDFLAGS=$(LDDEBUG) $(LDFLAGS)
-- 
cgit v1.2.3