Fixed up for new directory structure.

1 files changed, 28 insertions, 10 deletions

diff --git a/README b/README
index 0ac4f1ff1..31520b7f0 100644
--- a/README
+++ b/README
@@ -1,5 +1,8 @@
 README for building of Scintilla and SciTE
 
+Scintilla can be built by itself.
+To build SciTE, Scintilla must first be built.
+
 
 *** GTK+/Linux version ***
 
@@ -7,9 +10,17 @@ You must first have GTK+ 1.2x and GCC (2.8 or better) installed.
 GTK+ 1.0x will not work and when it did it was very slow.
 Other C++ compilers may work but may require tweaking the make file.
 
-To build SciTE for GTK+/Linux, use the Makefile_gtk like this:
+To build Scintilla, use the makefile located in the scintilla/gtk directory
+	cd scintilla/gtk
+	make
+	cd ../..
+	
+To build SciTE, use the makefile located in the scite/gtk directory
+	cd scite/gtk
+	make
 
-	make -f Makefile_gtk
+Install to /usr/local/bin
+	make install
 
 The current make file only supports static linking between SciTE and Scintilla.
 
@@ -20,14 +31,21 @@ SciTE reads its SciTEGlobal.properties file from the user's home directory.
 
 *** Windows version ***
 
-A C++ compiler is required. Mingw32 GCC 2.9.5 is the compiler used
-for most development although Visual C++ is also supported.
-
-To compile with GCC, use make on the "makefile" file.
-
-	make
+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.
 
-To compile with VC++, use nmake on the "makefile_vc" file.
+The make command used is 
+For GCC, make
+For VC++, nmake /f makefile_vc
+For Borland, make /f makefile_bor
 
-	nmake /f makefile_vc
+To build Scintilla, make in the scintilla/gtk directory
+	cd scintilla\win32
+	[make command as described above for your compiler]
+	cd ..\..
+	
+To build SciTE, use the makefile located in the scite/gtk directory
+	cd scite\win32
+	[make command as described above for your compiler]
 
+An executable SciTE will now be in scite\bin.
\ No newline at end of file