diff options
| author | Neil Hodgson <unknown> | 2016-04-28 16:07:24 +1000 |
|---|---|---|
| committer | Neil Hodgson <unknown> | 2016-04-28 16:07:24 +1000 |
| commit | dcc0fbcf61a9f2a12798b78a1e5d836d906e3b7e (patch) | |
| tree | 2f51fafb74f363ff89d66858ee36b988220ec721 | |
| parent | 474aab1c941497ae8275289bb0d7e5a214faeb2f (diff) | |
| download | scintilla-mirror-dcc0fbcf61a9f2a12798b78a1e5d836d906e3b7e.tar.gz | |
Fixes for problems with C++11 <regex>.
For Qt on Unix, set to build as C++11. Avoid deprecation warnings in PySide.
For GTK+ allow turning off C++11 <regex> with make NO_CXX11_REGEX=1.
| -rw-r--r-- | gtk/makefile | 4 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 9 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 9 | ||||
| -rw-r--r-- | qt/ScintillaEditPy/ScintillaEditPy.pro | 9 |
4 files changed, 29 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile index ca8d7c656..8fd92f6db 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -60,8 +60,8 @@ else THREADFLAGS= endif -ifdef CXX11_REGEX -REFLAGS=-DCXX11_REGEX +ifdef NO_CXX11_REGEX +REFLAGS=-DNO_CXX11_REGEX endif ifdef DEBUG diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 128021a04..1cd72f20c 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -11,6 +11,15 @@ TARGET = ScintillaEdit TEMPLATE = lib CONFIG += lib_bundle +unix { + # <regex> requires C++11 support + greaterThan(QT_MAJOR_VERSION, 4){ + CONFIG += c++11 + } else { + QMAKE_CXXFLAGS += -std=c++0x + } +} + VERSION = 3.6.5 SOURCES += \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index e6aa17235..6695f4b3e 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -11,6 +11,15 @@ TARGET = ScintillaEditBase TEMPLATE = lib CONFIG += lib_bundle +unix { + # <regex> requires C++11 support + greaterThan(QT_MAJOR_VERSION, 4){ + CONFIG += c++11 + } else { + QMAKE_CXXFLAGS += -std=c++0x + } +} + VERSION = 3.6.5 SOURCES += \ diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro index 9b0040782..49f7fb0f2 100644 --- a/qt/ScintillaEditPy/ScintillaEditPy.pro +++ b/qt/ScintillaEditPy/ScintillaEditPy.pro @@ -11,6 +11,15 @@ include(sepbuild.pri) VERSION = $$SCINTILLA_VERSION +unix { + # <regex> requires C++11 support + greaterThan(QT_MAJOR_VERSION, 4){ + CONFIG += c++11 + } else { + QMAKE_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations + } +} + win32 { DebugBuild { TARGET_EXT = _d.pyd |