From a6dd4eeab87d2562bd6280c594e01869e0bc4aa1 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 4 Apr 2018 16:21:09 +1000
Subject: 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.

---
 doc/ScintillaDoc.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'doc/ScintillaDoc.html')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 8ba5d668b..dcd61adb3 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -8298,12 +8298,11 @@ EM_SETTARGETDEVICE
 
     <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 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
-    code. <code>Scintilla_RegisterClasses</code> takes the <code>HINSTANCE</code> of your
+    bin/libscintilla.lib (or .a if using GCC) and call <code>Scintilla_RegisterClasses</code>.
+    <code>Scintilla_RegisterClasses</code> takes the <code>HINSTANCE</code> of your
     application and ensures that the "Scintilla" window class is registered.</p>
+    <p>When producing a stand-alone Scintilla DLL, the ScintillaDLL.cxx file should be compiled and
+    linked in to provide <code>DllMain</code> and <code>Scintilla_RegisterClasses</code>.</p>
 
     <h3>Ensuring lexers are linked into Scintilla</h3>
 
-- 
cgit v1.2.3