aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README8
-rw-r--r--doc/ScintillaDoc.html6
-rw-r--r--win32/makefile2
3 files changed, 8 insertions, 8 deletions
diff --git a/README b/README
index 61771676b..cd6140c8c 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ To build SciTE, Scintilla must first be built.
*** GTK+/Linux version ***
-You must first have GTK+ 2.18 or later and GCC (4.8 or better) installed.
+You must first have GTK+ 2.24 or later and GCC (7.1 or better) installed.
Clang may be used by adding CLANG=1 to the make command line.
Other C++ compilers may work but may require tweaking the make file.
Either GTK+ 2.x or 3.x may be used with 2.x the default and 3.x
@@ -43,8 +43,8 @@ The current make file only supports static linking between SciTE and Scintilla.
*** Windows version ***
A C++ 11 compiler is required.
-Visual Studio 2015 is the development system used for most development
-although Mingw32 4.8 is also supported.
+Visual Studio 2017 is the development system used for most development
+although Mingw-w64 7.1 is also supported.
To build Scintilla, make in the scintilla/win32 directory
cd scintilla\win32
@@ -61,7 +61,7 @@ An executable SciTE will now be in scite/bin.
*** GTK+/Windows version ***
-Mingw32 is known to work. Other compilers will probably not work.
+Mingw-w64 is known to work. Other compilers will probably not work.
Only Scintilla will build with GTK+ on Windows. SciTE will not work.
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index a7e7eba36..805c39bf8 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -8179,9 +8179,9 @@ EM_SETTARGETDEVICE
<p>To build Scintilla or SciTE, see the README file present in both the Scintilla and SciTE
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
+ The compiler must support C++14.
+ For Windows, GCC 7.1 or Microsoft Visual C++ 2017 can be used
+ for building. For GTK+, GCC 7.1 or newer should be used. GTK+ 2.24 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.</p>
diff --git a/win32/makefile b/win32/makefile
index 1af28c03f..07413f60f 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -1,7 +1,7 @@
# Make file for Scintilla on Windows
# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
# The License.txt file describes the conditions under which this software may be distributed.
-# This makefile assumes the MinGW32 version of GCC 4.x is used and changes will
+# This makefile assumes the Mingw-w64 version of GCC 7.1+ is used and changes will
# be needed to use other compilers.
ifdef CLANG