[geany/geany] 042963: scintilla: Don't build with C++11 regex support

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 26 May 2016 17:22:27 UTC
Commit:      04296390dea9d7e288adb7b559badf803b60dff8
             https://github.com/geany/geany/commit/04296390dea9d7e288adb7b559badf803b60dff8

Log Message:
-----------
scintilla: Don't build with C++11 regex support

It seems to cause some compatibility issues with some current compilers
and we don't use it nor need it for extended regex support, so stay on
the safe side at least for the moment.


Modified Paths:
--------------
    scintilla/Makefile.am
    scintilla/gtk/makefile.win32

Modified: scintilla/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@ SUBDIRS = include
 
 noinst_LTLIBRARIES=libscintilla.la
 
-AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER
+AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DNO_CXX11_REGEX
 
 LEXER_SRCS= \
 lexers/LexAbaqus.cxx \


Modified: scintilla/gtk/makefile.win32
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -32,7 +32,9 @@ vpath %.h ../src ../include ../lexlib
 vpath %.cxx ../src ../lexlib ../lexers
 
 INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) \
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts \
+	-DGTK -DSCI_LEXER -DNO_CXX11_REGEX \
+	$(INCLUDEDIRS) \
 	-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \
 	-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).