From 492076b58d09387ab9c2f60eaef364a6a65c4c28 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 8 Mar 2018 18:22:00 +1100
Subject: Backport: Create static library libscintilla.a or libscintilla.lib on
 Windows. Stop creating Lexers.a static library. Harmonize make files.

Backport of changeset 6477:a65186aab9f9.
---
 doc/ScintillaDoc.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc/ScintillaDoc.html')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 08b91778c..ba134cec4 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -8317,7 +8317,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
-- 
cgit v1.2.3