Updated for new build procedures for Microsoft and Borland compilers.

2 files changed, 16 insertions, 63 deletions

diff --git a/README b/README
index b0ff3c089..596d21e59 100644
--- a/README
+++ b/README
@@ -45,20 +45,19 @@ The current make file only supports static linking between SciTE and Scintilla.
 
 A C++ compiler is required. Mingw32 GCC 2.95.2 is the compiler used
 for most development although Visual C++ and Borland C++ are also supported.
-
-The make command used is 
-For GCC, make
-For VC++, nmake /f makefile_vc
-For Borland C++ 5.02 (MAKE Version 5.0), make -l -fmakefile_bor
-For Borland C++ Builder, make -fmakefile_bor
+For older versions of Borland make such as version 5.02, add the -l option. 
 
 To build Scintilla, make in the scintilla/win32 directory
-	cd scintilla\win32
-	[make command as described above for your compiler]
-	cd ..\..
+		cd scintilla\win32
+GCC:		make
+VC++:	nmake -f scintilla.mak
+Borland: 	make -fscintilla.mak
+		cd ..\..
 	
-To build SciTE, use the makefile located in the scite/win32 directory
-	cd scite\win32
-	[make command as described above for your compiler]
+To build SciTE, use the makefiles located in the scite/win32 directory
+		cd scite\win32
+GCC:		make
+VC++: 	nmake -f scite.mak
+Borland:	make -fscite.mak
 
 An executable SciTE will now be in scite\bin.
\ No newline at end of file
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 695dd3a63..b4cf75b7d 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -1155,59 +1155,13 @@ EM_SETTARGETDEVICE
       not be sensibly handled. Unsupported messages have no effect.
     </p>
     <h3>
-       Building Scintilla on Windows
+       Building Scintilla
     </h3>
     <p>
-       Scintilla and SciTE have been developed using Mingw32 GCC 2.9.5 and most testing has
-      occurred on executables produced by this compiler. It may also be compiled with Visual C++
-      which leads to smaller executables. It will no longer build with the older release of Mingw32
-      EGCS 1.1.2 which used a different set of Windows headers to GCC 2.9.5.
-    </p>
-    <p>
-       To compile with GCC, use make on the "makefile" file.<br />
-    </p>
-    <p>
-       To compile with VC++, use nmake on the "makefile_vc" file.
-    </p>
-    <p>
-       To compile with Borland C++ or C++ Builder, use make on the "makefile_bor" file.
-    </p>
-    <p>
-       Scintilla can also be linked into an application statically. To do this, the symbol
-      STATIC_BUILD should be defined and the function Scintilla_RegisterClasses called to
-      initialise Scintilla. The Sc1.exe target in the makefile demonstrates building a statically
-      linked version of SciTE.
-    </p>
-    <p>
-      To build everything, start in the directory that is above both scite and scintilla:<br />
-      <code>
-       cd scintilla\win32<br />
-       make<br />
-       cd ..\..<br />
-       cd scite\win32<br />
-       make<br />
-      </code>
-    </p>
-    <h3>
-       Building Scintilla with GTK+ on Linux
-    </h3>
-    <p>
-       On Linux, Scintilla and SciTE have been built with GCC and linked with GTK+ 1.2x. GTK+ 1.0x
-      will not work (and when it did it was very slow). The current make file only supports static
-      linking between SciTE and Scintilla. The scintilla/gtk/makefile file is used to build Scintilla and 
-      the scite/gtk/makefile file is used to build SciTE. To build and install everything, start in the 
-      directory that is above both scite and scintilla:<br />
-      <code>
-       cd scintilla/gtk<br />
-       make<br />
-       cd ../..<br />
-       cd scite/gtk<br />
-       make<br />
-       make install<br />
-      </code><br />
-       The make install command searches for Gnome, and if found installs SciTE relative to Gnome
-       and places SciTE in the Gnome Applications menu. SciTE can be removed with make uninstall 
-       command.
+       To build Scintilla or SciTE, see the README file present in both the scintilla and 
+       scite directories. For Windows, GCC 2.95.2, Borland C++ or Microsoft Visual C++ can 
+       be used for building. For GTK+, GCC 2.95.2 should be used. Only GTK+ 1.2x is 
+       supported.
     </p>
   </body>
 </html>