Applied patch [ 1331340 ] faster Drawing of Polygons and Polylines

[wxWidgets.git] / BuildCVS.txt

diff --git a/BuildCVS.txt b/BuildCVS.txt
index b7ddba7b44fe2e9b28f7d9a51b4380587905e2ab..1e85521ae495a8bbc6dd5905c80b4286600595d2 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -12,9 +12,8 @@ a) If using Microsoft Visual C++ 5.0 or 6.0
 
 Ensure that the command-line compiler and tools (including
 nmake) are installed and ready to run.  Depending on your
-installation there may be a batch file (named something like
-VCVARS32.BAT) that needs to be run to set correct environment
-varaibles and PATH entries.
+installation there may be a batch file (commonly named VCVARS32.BAT)
+that needs to be run to set correct environment variables and PATH entries.
 
 Continue with item c) below.
 
@@ -23,15 +22,15 @@ b) If using the MinGW or Cygwin compilers
 
 You can get MinGW from  http://www.mingw.org/
 
-Cygwin is available at  http://sources.redhat.com/cygwin/
+Cygwin is available at  http://www.cygwin.com/
 
 If you are using Cygwin or MinGW together with the MSYS environment, you
 can build the library using configure (see "Unix ports" and
 "Windows using configure" below). You can also
-build wxWindows without configure using native makefile, but only with
+build wxWidgets without configure using native makefile, but only with
 MinGW. Using Cygwin together with Windows makefile is no longer supported.
 
-If building with Mingw without configure:
+If building with MinGW without configure:
 
 -> Set your path so that it includes the directory
    where your compiler and tools reside
@@ -50,17 +49,18 @@ If using configure, Unix instructions apply.
 
 c) Build instructions
 
--> Assumming that you installed the wxWindows sources
-   into c:\wxWin
--> Copy c:\wxWin\include\wx\msw\setup0.h
-   to   c:\wxWin\include\wx\msw\setup.h
--> Edit c:\wxWin\include\wx\msw\setup.h to choose
-   the features you would like to compile wxWindows with[out].
+Assumming that you installed the wxWidgets sources
+into c:\wxWidgets:
+
+-> Copy c:\wxWidgets\include\wx\msw\setup0.h
+   to   c:\wxWidgets\include\wx\msw\setup.h
+-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
+   the features you would like to compile wxWidgets with[out].
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
--> type: cd c:\wxWin\build\win32
+-> type: cd c:\wxWidgets\build\msw
 -> type: make -f makefile.gcc  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)
 etc.
@@ -70,9 +70,9 @@ etc.
 d) Borland (including free command line tools)
    Download tools from http://www.borland.com/downloads/
    
-   See docs/msw/install.txt for details; in brief
+   See docs/msw/install.txt for details; in brief:
 
--> type cd %WXWIN%\build\win32
+-> type cd c:\wxWidgets\build\msw
 -> type make -f makefile.bcc
 
 You can customize many things in the build process, detailed description is
@@ -92,12 +92,12 @@ GNU autoconf package (version > 2.54) installed
 on your system and type run "autoconf" in the base
 directory (or run the autogen.sh script in the same
 directory, which just calls autoconf). Note that you usually don't
-need to do this because configure is included in cVS.
+need to do this because configure is included in CVS.
 
 Set WXWIN environment variable to the base directory such
-as ~/wxWindows (this is actually not really needed).
+as ~/wxWidgets (this is actually not really needed).
 
--> type: export WXWIN=~/wxWindows
+-> type: export WXWIN=~/wxWidgets
 -> type: md mybuild
 -> type: cd mybuild
 -> type: ../configure --with-motif
@@ -116,7 +116,7 @@ yet complete).
 III) Windows using configure
 ----------------------------------------
 
-wxWindows can be built on Windows using MSYS (see
+wxWidgets can be built on Windows using MSYS (see
 http://www.mingw.org/), which is a POSIX build environment
 for Windows. With MSYS you can just ./configure && make (see also VII,
 Unix->Windows cross-compiling using configure).
@@ -128,7 +128,7 @@ IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
 ----------------------------------------
 
 Refer to the readme.txt and install.txt files in docs/mac to build
-wxWindows under Classic Mac OS using CodeWarrior.
+wxWidgets under Classic Mac OS using CodeWarrior.
 
 If you are checking out the CVS sources using cvs under Mac OS X and
 compiling under Classic Mac OS:
@@ -162,6 +162,7 @@ or type: ../configure
 
 VI) OS/2
 ----------------------------------------
+No notes.
 
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------
@@ -181,9 +182,9 @@ preferable if you write portable C(++). ]
 
 You might want to build both Unix and Windows binaries in the same source
 tree; to do this make subdirs for each e.g. unix and win32. If you've
-already build wxWindows in the main dir, do a 'make distclean' there,
+already build wxWidgets in the main dir, do a 'make distclean' there,
 otherwise configure will get confused. (In any case, read the section 'Unix
-using configure' and make sure you're able to build a native wxWindows
+using configure' and make sure you're able to build a native wxWidgets
 library; cross-compiling errors can be pretty obscure and you'll want to be
 sure that your configure setup is basically sound.)