diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-10-02 18:17:13 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-10-02 18:17:13 +1000 |
| commit | d99936faf68f6caa3608f0c597a183febd399e14 (patch) | |
| tree | 592064c86cd3910e931fbb37b07b02399e1af675 /win32 | |
| parent | 96015b4a54a7cdeb3f59ed6eae2394f4e86bb4e8 (diff) | |
| download | scintilla-mirror-d99936faf68f6caa3608f0c597a183febd399e14.tar.gz | |
Allow using C++11 <regex> for searches as a provisional feature.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 6 | ||||
| -rw-r--r-- | win32/scintilla.mak | 4 |
2 files changed, 9 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 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) |