aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/makefile
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-10-02 18:17:13 +1000
committerNeil <nyamatongwe@gmail.com>2014-10-02 18:17:13 +1000
commitd99936faf68f6caa3608f0c597a183febd399e14 (patch)
tree592064c86cd3910e931fbb37b07b02399e1af675 /win32/makefile
parent96015b4a54a7cdeb3f59ed6eae2394f4e86bb4e8 (diff)
downloadscintilla-mirror-d99936faf68f6caa3608f0c597a183febd399e14.tar.gz
Allow using C++11 <regex> for searches as a provisional feature.
Diffstat (limited to 'win32/makefile')
-rw-r--r--win32/makefile6
1 files changed, 5 insertions, 1 deletions
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