From 8e3966f74ef0bbec02a7a50ddf2fdb007feed019 Mon Sep 17 00:00:00 2001
From: Neil
Date: Tue, 21 Mar 2017 09:58:56 +1100
Subject: Document C++11 requirement.
---
README | 7 ++-----
doc/ScintillaDoc.html | 8 +++++---
doc/ScintillaHistory.html | 3 +++
doc/index.html | 4 ++--
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/README b/README
index ca2f2c059..61771676b 100644
--- a/README
+++ b/README
@@ -42,13 +42,10 @@ The current make file only supports static linking between SciTE and Scintilla.
*** Windows version ***
-A C++ compiler is required, with C++11 required for building SciTE.
+A C++ 11 compiler is required.
Visual Studio 2015 is the development system used for most development
although Mingw32 4.8 is also supported.
-Older compilers may not have a working std::regex so this can be disabled
-with the make argument NO_CXX11_REGEX=1.
-
To build Scintilla, make in the scintilla/win32 directory
cd scintilla\win32
GCC: mingw32-make
@@ -74,7 +71,7 @@ To build Scintilla, make in the scintilla/gtk directory
*** macOS Cocoa version ***
-Xcode 7 or 8 may be used to build Scintilla on macOS.
+Xcode 8 may be used to build Scintilla on macOS.
There is no open source version of SciTE for macOS but there is a commercial
version available through the App Store.
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 631b38eb8..52616b02f 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -665,7 +665,7 @@ struct Sci_TextRange {
The base regular expression support
is limited and should only be used for simple cases and initial development.
The C++ runtime <regex> library may be used by setting the SCFIND_CXX11REGEX search flag.
- When using an older C++ compiler that does not support C++11, this may be turned off by
+ The C++11 <regex> support may be disabled by
compiling Scintilla with NO_CXX11_REGEX defined.
A different regular expression
library can be integrated into Scintilla
@@ -8165,8 +8165,10 @@ EM_SETTARGETDEVICE
Building Scintilla
To build Scintilla or SciTE, see the README file present in both the Scintilla and SciTE
- directories. For Windows, GCC 4.7 or Microsoft Visual C++ 2010 can be used
- for building. For GTK+, GCC 4.4 or newer should be used. GTK+ 2.18+ and 3.x are
+ directories.
+ The compiler must support C++11.
+ For Windows, GCC 4.8 or Microsoft Visual C++ 2015 can be used
+ for building. For GTK+, GCC 4.8 or newer should be used. GTK+ 2.18+ and 3.x are
supported with glib 2.22+. The version of GTK+ installed should be detected automatically.
When both GTK+ 2 and GTK+ 3 are present, building for GTK+ 3.x requires defining GTK3
on the command line.
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 751e5b377..a21cbf63d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -527,6 +527,9 @@
Released 21 March 2017.
+ Requires a C++11 compiler. GCC 4.8 and MSVC 2015 are supported.
+
+
Support dropped for Windows NT 4.
diff --git a/doc/index.html b/doc/index.html
index f96b0eaf0..de775fbac 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -128,8 +128,8 @@ if (!IsRemote()) { //if NOT remote...
Scintilla and SciTE are currently available for Intel Win32, OS X, and Linux compatible operating
- systems with GTK+. They have been run on Windows XP, Windows 7, OS X 10.6+, and on Ubuntu 10.10
- with GTK+ 2.20. Here is a screenshot of
+ systems with GTK+. They have been run on Windows XP, Windows 7, OS X 10.7+, and on Ubuntu 14.04
+ with GTK+ 2.24. Here is a screenshot of
SciTE.
--
cgit v1.2.3