From 1cd26e8ee9577099631a72836197afd101aaaff5 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 4 Apr 2018 16:21:09 +1000
Subject: Backport: Move DLL entry points DllMain and Scintilla_DirectFunction
 into ScintillaDLL.cxx to simplify build process by eliminating the
 compilation of ScintillaWin.cxx into ScintillaWinS.o|obj.

Backport of changeset 6670:cfe90078d684.
---
 doc/ScintillaHistory.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'doc/ScintillaHistory.html')

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 0324381d2..67aeed2ad 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -531,14 +531,20 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
-    <h3>
-       <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.?/scintilla380.zip/download">Release 3.?</a>
-    </h3>
-    <ul>
+	<h3>
+		 <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.?/scintilla?.zip/download">Release 3.?</a>
+	</h3>
+	<ul>
 	<li>
 	Released ?.
 	</li>
 	<li>
+	On Win32, a new file, ScintillaDLL.cxx, provides
+	the DllMain function required for a stand-alone Scintilla DLL. Build and project files should include this
+	file when producing a DLL and omit it when producing a static library or linking Scintilla statically.
+	The STATIC_BUILD preprocessor symbol is no longer used.
+	</li>
+	<li>
 	In some cases, invalid UTF-8 is handled in a way that is a little friendlier.
 	For example, when copying to the clipboard on Windows, an invalid lead byte will be copied as the
 	equivalent ISO 8859-1 character and will not hide the following byte.
-- 
cgit v1.2.3