diff options
Diffstat (limited to 'doc/ScintillaDoc.html')
| -rw-r--r-- | doc/ScintillaDoc.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index f9bc4259e..633508035 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -8285,8 +8285,8 @@ 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++14. - For Windows, GCC 7.1 or Microsoft Visual C++ 2017 can be used + The compiler must support C++17. + For Windows, GCC 7.1 or Microsoft Visual C++ 2017.5 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 @@ -8295,7 +8295,8 @@ EM_SETTARGETDEVICE <h3>Static linking</h3> <p>On Windows, Scintilla is normally used as a dynamic library as a .DLL file. If you want to - link Scintilla directly into your application .EXE or .DLL file, then the + link Scintilla directly into your application .EXE or .DLL file, then you can link to the static library + bin/libscintilla.lib (or .a if using GCC) and call <code>Scintilla_RegisterClasses</code>. Otherwise, if using an IDE or other build system, then the <code>STATIC_BUILD</code> preprocessor symbol should be defined and <code>Scintilla_RegisterClasses</code> called. <code>STATIC_BUILD</code> prevents compiling the <code>DllMain</code> function which will conflict with any <code>DllMain</code> defined in your |