From e77027687d205f0f6059bbb93a79395afc460234 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 8 Mar 2018 18:22:00 +1100 Subject: Create static library libscintilla.a or libscintilla.lib on Windows. Stop creating Lexers.a static library. Harmonize make files. --- doc/ScintillaDoc.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') 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

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

Static linking

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 Scintilla_RegisterClasses. Otherwise, if using an IDE or other build system, then the STATIC_BUILD preprocessor symbol should be defined and Scintilla_RegisterClasses called. STATIC_BUILD prevents compiling the DllMain function which will conflict with any DllMain defined in your -- cgit v1.2.3