remove MSVC solution files from svn

[wxWidgets.git] / docs / msw / install.txt

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index c2f9ebd25834689b98747b26ade5501d8a67e7a9..f3ab0fe286d6542062596ce64ed95242faa696fa 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -8,21 +8,26 @@ These installation notes can be found in docs/msw/install.txt
 in your wxWidgets distribution.
 
 IMPORTANT NOTE: If you experience problems installing, please
 in your wxWidgets distribution.
 
 IMPORTANT NOTE: If you experience problems installing, please

-re-read this instructions and other related files (changes.txt,
-readme.txt, FAQ) carefully before mailing wx-users. Preferably,
-try to fix the problem first and then upload a patch to
-SourceForge:
+re-read these instructions and other related files (changes.txt,
+readme.txt, FAQ) carefully before posting to wx-users list.

 
 

-  http://sourceforge.net/patch/?group_id=9863
+If you are sure that you found a bug, please report it at
+wxWidgets Trac:

 
 

-Please report bugs using the SourceForge bug tracker:
+  http://trac.wxwidgets.org/newticket
+
+Please notice that often trying to correct the bug yourself is the
+quickest way to fix it. Even if you fail to do it, you may
+discover valuable information allowing us to fix it while doing
+it. We also give much higher priority to bug reports with patches
+fixing the problems so this ensures that your report will be
+addressed sooner.

 
 

-  http://sourceforge.net/bugs/?group_id=9863

 
 Unarchiving
 ============================================================
 
 
 Unarchiving
 ============================================================
 

-A setup program is provided (setup.exe) to automatically copy
+A setup program is provided (wxMSW-x.x.x-setup.exe) to automatically copy

 files to a directory on your hard disk. Do not install into a
 path that contains spaces.
 
 files to a directory on your hard disk. Do not install into a
 path that contains spaces.
 


@@ -31,11 +36,9 @@ The setup program contains the following:
 - All common, generic and MSW-specific wxWidgets source;
 - samples and demos;
 - documentation in MS HTML Help format;
 - All common, generic and MSW-specific wxWidgets source;
 - samples and demos;
 - documentation in MS HTML Help format;

-- makefiles for most Windows compilers, plus CodeWarrior,
-  BC++ and VC++ IDE files;
-- JPEG library source;
-- TIFF library source;
-- Object Graphics Library, Tex2RTF, wxSTC, etc.
+- makefiles for most Windows compilers, plus CodeWarrior
+  and VC++ IDE files;
+- JPEG, TIFF, PNG, ZLIB, wxSTC, REGEX, EXPAT library sources.

 
 Alternatively, you may unarchive the .zip form by hand:
 wxMSW-x.y.z.zip where x.y.z is the version number.
 
 Alternatively, you may unarchive the .zip form by hand:
 wxMSW-x.y.z.zip where x.y.z is the version number.


@@ -46,7 +49,7 @@ files into a suitable directory such as c:\wx.
 General installation notes
 ==========================
 
 General installation notes
 ==========================
 

-If installing from the CVS server, copy include/wx/msw/setup0.h to
+If installing from the SVN server, copy include/wx/msw/setup0.h to

 include/wx/msw/setup.h and edit the resulting file to choose
 the features you would like to compile wxWidgets with[out].
 
 include/wx/msw/setup.h and edit the resulting file to choose
 the features you would like to compile wxWidgets with[out].
 


@@ -59,7 +62,7 @@ Cygwin/Mingw32 to quickly locate the instructions for your compiler.
 
 All makefiles and project are located in build\msw directory.
 
 
 All makefiles and project are located in build\msw directory.
 

-Where compiled files are stored
+Where Compiled Files are Stored

 -------------------------------
 
 After successful compilation you'll find the libraries in a subdirectory
 -------------------------------
 
 After successful compilation you'll find the libraries in a subdirectory


@@ -72,12 +75,12 @@ A couple of examples:
   lib\wat_dll                   Watcom C++ DLLs
 
 Names of compiled wxWidgets libraries follow this scheme: libraries that don't
   lib\wat_dll                   Watcom C++ DLLs
 
 Names of compiled wxWidgets libraries follow this scheme: libraries that don't

-depend on GUI components begin with "wxbase" followed by version number and
-letters indicating if the library is compiled as Unicode ('u') and/or debug
-build ('d'). Last component of them name is name of wxWidgets component
-(unless you built the library as single monolithic library; look for
-"Configuring the build" below). This is a typical set of release ANSI build
-libraries (release versions on left, debug on right side):
+depend on GUI components begin with "wxbase" followed by a version number and,
+optionally, letters indicating Unicode compilation ('u') and a debug build ('d').
+The last component is the name of the wxWidgets component (unless you build the
+library as single monolithic library; look for "Configuring the Build" below).
+This is a typical set of release ANSI build libraries (release versions on
+left, debug on right side):

 
   wxbase29.lib              wxbase29d.lib
   wxbase29_net.lib          wxbase29d_net.lib
 
   wxbase29.lib              wxbase29d.lib
   wxbase29_net.lib          wxbase29d_net.lib


@@ -95,9 +98,9 @@ Their Unicode debug counterparts in wxUniversal build would be
   wxmswuniv29ud_html.lib
   wxmswuniv29ud_adv.lib
 
   wxmswuniv29ud_html.lib
   wxmswuniv29ud_adv.lib
 

-These directories also contain subdirectory with wx/setup.h header. This
-subdirectory is named after port, Unicode, wxUniv and debug settings and 
-you must add it to include paths when compiling your application. Some
+These directories also contain a subdirectory with the wx/setup.h header. This
+subdirectory is named after the port, Unicode, wxUniv and debug settings and
+you must add it to the include paths when compiling your application. Some

 examples:
 
   lib\vc_lib\msw\wx\setup.h          VC++ static, wxMSW
 examples:
 
   lib\vc_lib\msw\wx\setup.h          VC++ static, wxMSW


@@ -105,15 +108,15 @@ examples:
   lib\vc_lib\mswunivd\wx\setup.h     VC++ static, wxUniversal, debug
 
 Below are compiler specific notes followed by customizing instructions that
   lib\vc_lib\mswunivd\wx\setup.h     VC++ static, wxUniversal, debug
 
 Below are compiler specific notes followed by customizing instructions that

-apply to all compilers (search for "Configuring the build").
+apply to all compilers (search for "Configuring the Build").

 
 

-Microsoft Visual C++ compilation
+Microsoft Visual C++ Compilation

 ----------------------------------------------------------------
 
 ----------------------------------------------------------------
 

-You may wish to visit http://wiki.wxwindows.org/wiki.pl?MSVC for a more
-informal and more detailed description of the process summarized below.
+You may wish to visit http://wiki.wxwidgets.org/Microsoft_Visual_C%2B%2B_Guide
+for a more informal and detailed description of the process summarized below.

 
 

-Please note that the VC++ 6.0 project files will work for VC++ .NET also.
+Please note that the VC++ 6.0 project files will work for VC++ .NET as well.

 
 VC++ 5.0 can also be used, providing Service Pack 3 is applied. Without it
 you will have trouble with internal compiler errors. It is available for
 
 VC++ 5.0 can also be used, providing Service Pack 3 is applied. Without it
 you will have trouble with internal compiler errors. It is available for


@@ -129,19 +132,19 @@ Using project files (VC++ 6 and later):
    Normally you'll use a static linking ANSI configuration.
    Choose the Win32 Debug or Win32 Release configuration (or any other that
    suits your needs) and use Batch Build to compile _all_ projects. If you
    Normally you'll use a static linking ANSI configuration.
    Choose the Win32 Debug or Win32 Release configuration (or any other that
    suits your needs) and use Batch Build to compile _all_ projects. If you

-   know you won't need some of the libraries (i.e. html part), you don't have
+   know you won't need some of the libraries (e.g. the HTML part), you don't have

    to compile it.  It will also produce similar variations on jpeg.lib,
    png.lib, tiff.lib, zlib.lib, and regex.lib.
 
    If you want to build DLL configurations in wx.dsw project you unfortunately
    need to build them in the proper order (jpeg, png, tiff, zlib, regex, expat,
    to compile it.  It will also produce similar variations on jpeg.lib,
    png.lib, tiff.lib, zlib.lib, and regex.lib.
 
    If you want to build DLL configurations in wx.dsw project you unfortunately
    need to build them in the proper order (jpeg, png, tiff, zlib, regex, expat,

-   base, net, odbc, core, gl, html, media, qa, adv, dbgrid, xrc, aui, richtext)
-   manually because VC6 doesn't always respect the correct build order.
+   base, net, odbc, core, gl, html, media, qa, adv, dbgrid, xrc, aui, richtext,
+   propgrid) manually because VC6 doesn't always respect the correct build order.

 
    Alternatively, use the special wx_dll.dsw project which adds the
    dependencies to force the correct order (but, because of this, doesn't work
    for the static libraries) or simply redo the build several times until all
 
    Alternatively, use the special wx_dll.dsw project which adds the
    dependencies to force the correct order (but, because of this, doesn't work
    for the static libraries) or simply redo the build several times until all

-   DLLs are linked correctly. Pleae notice that it's normal that dbgrid project
+   DLLs are linked correctly. Please notice that it's normal that dbgrid project

    doesn't build if wxUSE_ODBC is set to 0 (default).
 3. Open a sample project file, choose a configuration such as
    Win32 Debug using Build | Set Active Configuration..., and compile.
    doesn't build if wxUSE_ODBC is set to 0 (default).
 3. Open a sample project file, choose a configuration such as
    Win32 Debug using Build | Set Active Configuration..., and compile.


@@ -159,7 +162,7 @@ Using makefiles:
   'nmake -f makefile.vc'
 
    to make the wxWidgets core library as release DLL.
   'nmake -f makefile.vc'
 
    to make the wxWidgets core library as release DLL.

-   See "Configuring the build" for instruction how to build debug or static
+   See "Configuring the Build" for instruction how to build debug or static

    libraries.
 
 2. Change directory to samples and type 'nmake -f makefile.vc'
    libraries.
 
 2. Change directory to samples and type 'nmake -f makefile.vc'


@@ -192,9 +195,9 @@ the project. After this, delete everything (including PCH) and recompile.
 
 Note (4): to create your own IDE files, copy .dsp and .dsw
 files from an existing wxWidgets sample and adapt them, or
 
 Note (4): to create your own IDE files, copy .dsp and .dsw
 files from an existing wxWidgets sample and adapt them, or

-visit http://wiki.wxwindows.org/wiki.pl?MSVC.
+visit http://wiki.wxwidgets.org/Microsoft_Visual_C%2B%2B_Guide.

 
 

-Microsoft Visual C++ compilation for 64-bit Windows
+Microsoft Visual C++ Compilation for 64-bit Windows

 ----------------------------------------------------------------
 
 Visual Studio 2005 includes 64-bit compilers, though they are not installed by
 ----------------------------------------------------------------
 
 Visual Studio 2005 includes 64-bit compilers, though they are not installed by


@@ -269,13 +272,17 @@ If you receive this error add bufferoverflowu.lib to link, e.g.:
 
 See http://support.microsoft.com/?id=894573 for more information.
 
 
 See http://support.microsoft.com/?id=894573 for more information.
 

-Borland C++ compilation
+Borland C++ Compilation

 ----------------------------------------------------------------
 
 The minimum version required is 5.5 (last version supported by BC++ 5.0 was
 2.4.2), which can be downloaded for free from:
 http://www.borland.com/products/downloads/download_cbuilder.html
 
 ----------------------------------------------------------------
 
 The minimum version required is 5.5 (last version supported by BC++ 5.0 was
 2.4.2), which can be downloaded for free from:
 http://www.borland.com/products/downloads/download_cbuilder.html
 

+We have found that the free Turbo Explorer and commercial BDS work fine; the
+debugger is very good. To avoid linker errors you will need to add
+-DSHARED=1 to the makefile line for the library
+

 The version 5.6 included in Borland C++ Builder 2006 works as well after the
 following small change: please remove the test for __WINDOWS__ from line 88
 of the file BCCDIR\include\stl\_threads.h.
 The version 5.6 included in Borland C++ Builder 2006 works as well after the
 following small change: please remove the test for __WINDOWS__ from line 88
 of the file BCCDIR\include\stl\_threads.h.


@@ -287,7 +294,7 @@ Compiling using the makefiles:
    This produces a couple of libraries in the lib\bcc_lib directory.
 
 2. Change directory to a sample or demo such as samples\minimal, and type
    This produces a couple of libraries in the lib\bcc_lib directory.
 
 2. Change directory to a sample or demo such as samples\minimal, and type

-  'make -f makefile.bcc'. This produces a windows exe file - by default 
+  'make -f makefile.bcc'. This produces a windows exe file - by default

    in the bcc_mswd subdirectory.
 
 Note (1): the wxWidgets makefiles assume dword structure alignment. Please
    in the bcc_mswd subdirectory.
 
 Note (1): the wxWidgets makefiles assume dword structure alignment. Please


@@ -306,28 +313,25 @@ debug mode, edit makefile.bcc and change /aa to /Tpe in link commands.
 Using the Debugger and IDE in BDS or Turbo Explorer
 ---------------------------------------------------
 
 Using the Debugger and IDE in BDS or Turbo Explorer
 ---------------------------------------------------
 

-
-Doubleclick / open samples\minimal\borland.bdsproj. The current version 
+Doubleclick / open samples\minimal\borland.bdsproj. The current version

 is to be used with a dynamic build of wxWidgets-made by running
 make -f Makefile.bcc -DBUILD=debug -DSHARED=1
 in wxWidgets\build\msw. You also need the wxWidgets\lib\bcc_dll
 is to be used with a dynamic build of wxWidgets-made by running
 make -f Makefile.bcc -DBUILD=debug -DSHARED=1
 in wxWidgets\build\msw. You also need the wxWidgets\lib\bcc_dll

-directory in your PATH. The debugger tracks your source and aslo
-travces into the wxWidgets sources.
+directory in your PATH. The debugger tracks your source and also
+traces into the wxWidgets sources.

 
 To use this to debug other samples, copy the borland_ide.cpp
 
 To use this to debug other samples, copy the borland_ide.cpp

-and borland.bdsproj files, then replace all occurences of
+and borland.bdsproj files, then replace all occurrences of

 "minimal" with the name of the new project files
 
 "minimal" with the name of the new project files
 

-Compilation succeeds with CBuilderX personal edition and CBuilder6, but 
+Compilation succeeds with CBuilderX personal edition and CBuilder6, but

 you may have to copy make.exe from the 5.5 download to the new bin directory.
 
 you may have to copy make.exe from the 5.5 download to the new bin directory.
 

-Compiling using the IDE files for Borland C++ 5.0 and using CBuilder IDE 
-(v1-v6): not supported 
-
+Compiling using the IDE files for Borland C++ 5.0 and using CBuilder IDE
+(v1-v6): not supported

 
 
 ** REMEMBER **
 
 
 ** REMEMBER **

-

 In all of your wxWidgets applications, your source code should include
 the following preprocessor directive:
 
 In all of your wxWidgets applications, your source code should include
 the following preprocessor directive:
 


@@ -338,13 +342,13 @@ the following preprocessor directive:
 (check the samples -- e.g., \wx2\samples\minimal\minimal.cpp -- for
 more details)
 
 (check the samples -- e.g., \wx2\samples\minimal\minimal.cpp -- for
 more details)
 

-Borland 16 Bit compilation for Windows 3.1
+Borland 16 Bit Compilation for Windows 3.1

 ----------------------------------------------------------------
 
 The last version of wxWidgets to support 16-bit compilation with Borland was
 2.2.7 - Please download and read the instructions in that release
 
 ----------------------------------------------------------------
 
 The last version of wxWidgets to support 16-bit compilation with Borland was
 2.2.7 - Please download and read the instructions in that release
 

-Watcom C++ 10.6/11 and OpenWatcom compilation
+Watcom C++ 10.6/11 and OpenWatcom Compilation

 ----------------------------------------------------------------
 
 1. Change directory to build\msw. Type 'wmake -f makefile.wat' to
 ----------------------------------------------------------------
 
 1. Change directory to build\msw. Type 'wmake -f makefile.wat' to


@@ -375,7 +379,7 @@ Note (5): wxUSE_STD_STRING is disabled in wx/string.h for Watcom as this
           for __WATCOM__).
 
 
           for __WATCOM__).
 
 

-Metrowerks CodeWarrior compilation
+Metrowerks CodeWarrior Compilation

 ----------------------------------------------------------------
 
 ** NOTE: We don't use Metrowerks compiler any more and so depend on
 ----------------------------------------------------------------
 
 ** NOTE: We don't use Metrowerks compiler any more and so depend on


@@ -388,7 +392,7 @@ Metrowerks CodeWarrior compilation
    included in wxMSW-2.8.x.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
    included in wxMSW-2.8.x.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if

-   you are working from the CVS version) to make sure the settings reflect
+   you are working from the SVN version) to make sure the settings reflect

    what you want.  If you aren't sure, leave it alone and go with the
    default settings.  A few notes:
        - Don't use wxUSE_DEBUG_NEW_ALWAYS: it doesn't mix well with MSL
    what you want.  If you aren't sure, leave it alone and go with the
    default settings.  A few notes:
        - Don't use wxUSE_DEBUG_NEW_ALWAYS: it doesn't mix well with MSL


@@ -397,19 +401,19 @@ Metrowerks CodeWarrior compilation
          and runtime libs.
 
 3. The project file to build the Win32 wxWidgets libraries relies on the
          and runtime libs.
 
 3. The project file to build the Win32 wxWidgets libraries relies on the

-   Batch File Runner plug-in.  This plug-in is not installed as part of
-   a normal CW7 installation.  However, you can find this plug-in on the
-   CodeWarrior Reference CD, in the Thrill Seekers folder; it's call the
+   Batch File Runner plug-in. This plug-in is not installed as part of
+   a normal CW7 installation. However, you can find this plug-in on the
+   CodeWarrior Reference CD, in the Thrill Seekers folder; it's called the

    "Batch File Post Linker".
 
 4. If you choose not to install the Batch File Runner plug-in, then you
    need to do the following by hand:
       (1) Create the directories lib\cw7msw\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are
    "Batch File Post Linker".
 
 4. If you choose not to install the Batch File Runner plug-in, then you
    need to do the following by hand:
       (1) Create the directories lib\cw7msw\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are

-          working from the CVS version) to lib\cw7msw\include\wx\setup.h
+          working from the SVN version) to lib\cw7msw\include\wx\setup.h

       (2) Create the directories lib\cw7mswd\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are
       (2) Create the directories lib\cw7mswd\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are

-          working from the CVS version) to lib\cw7mswd\include\wx\setup.h
+          working from the SVN version) to lib\cw7mswd\include\wx\setup.h

 
 5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp.
    Store this project file in directory src.  You may get warnings about
 
 5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp.
    Store this project file in directory src.  You may get warnings about


@@ -428,8 +432,8 @@ Metrowerks CodeWarrior compilation
        - wx_x86.lib             ANSI Release (static)
        - wx_x86_d.lib           ANSI Debug (static)
 
        - wx_x86.lib             ANSI Release (static)
        - wx_x86_d.lib           ANSI Debug (static)
 

-8. Sorry, I haven't had time yet to create and test unicode or DLL versions.
-   Volunteers for this are welcome (as neither DLLs nor unicode builds are
+8. Sorry, I haven't had time yet to create and test Unicode or DLL versions.
+   Volunteers for this are welcome (as neither DLLs nor Unicode builds are

    big priorities for me ;).
 
 9. CodeWarrior Pro7 project files (in XML format) are also provided for some
    big priorities for me ;).
 
 9. CodeWarrior Pro7 project files (in XML format) are also provided for some


@@ -445,7 +449,7 @@ Metrowerks CodeWarrior compilation
          griddemo.cpp.  Build and run....
 
 
          griddemo.cpp.  Build and run....
 
 

-Cygwin/MinGW compilation
+Cygwin/MinGW Compilation

 ----------------------------------------------------------------
 
 wxWidgets supports Cygwin (formerly GnuWin32) betas and
 ----------------------------------------------------------------
 
 wxWidgets supports Cygwin (formerly GnuWin32) betas and


@@ -474,7 +478,7 @@ the instructions with either of these packages.
 If using MinGW, you can download the add-on MSYS package to
 provide Unix-like tools that you'll need to build wxWidgets using configure.
 
 If using MinGW, you can download the add-on MSYS package to
 provide Unix-like tools that you'll need to build wxWidgets using configure.
 

-Using makefiles directly
+Using makefiles Directly

 ----------------------------------------------------------------
 
 NOTE: The makefile.gcc makefiles are for compilation under MinGW using
 ----------------------------------------------------------------
 
 NOTE: The makefile.gcc makefiles are for compilation under MinGW using


@@ -482,23 +486,20 @@ NOTE: The makefile.gcc makefiles are for compilation under MinGW using
       other environments (such as UNIX or Unix-like, e.g. MSYS where you have
       to use configure instead, see the section below)
 
       other environments (such as UNIX or Unix-like, e.g. MSYS where you have
       to use configure instead, see the section below)
 

-Here are the steps required using the provided makefiles:
-
-- If you are using gcc-2.95, edit build\msw\config.gcc and set the GCC_VERSION
-  variable to "2.95".
-
-- Use the makefile.gcc files for compiling wxWidgets and samples,
-  e.g. to compile a debugging version of wxWidgets:
+Use the makefile.gcc files for compiling wxWidgets and samples,
+e.g. to compile a debugging version of wxWidgets:

   > cd c:\wx\build\msw
   > cd c:\wx\build\msw

-  > make -f makefile.gcc BUILD=debug
+  > mingw32-make -f makefile.gcc BUILD=debug

   > cd c:\wx\samples\minimal
   > cd c:\wx\samples\minimal

-  > make -f makefile.gcc BUILD=debug
+  > mingw32-make -f makefile.gcc BUILD=debug

   (See below for more options.)
 
   (See below for more options.)
 

-  Ignore the warning about the default entry point.
+Notice that Windows command interpreter (cmd.exe) and mingw32-make must be
+used, using Bash (sh.exe) and make.exe from MSYS will only work when using
+configure-based build procedure described below!

 
 

-- Use the 'strip' command to reduce executable/dll size (note that
-  stripping an executable/dll will remove debug information!).
+You can also use the 'strip' command to reduce executable/dll size (note that
+stripping an executable/dll will remove debug information!).

 
 All targets have 'clean' targets to allow removal of object files
 and other intermediate compiler files.
 
 All targets have 'clean' targets to allow removal of object files
 and other intermediate compiler files.


@@ -601,12 +602,12 @@ OLD VERSIONS:
   from e.g. the MinGW distribution, to a directory in your path.
 
 
   from e.g. the MinGW distribution, to a directory in your path.
 
 

-Symantec & DigitalMars C++ compilation
+Symantec & DigitalMars C++ Compilation

 ----------------------------------------------------------------
 
 ----------------------------------------------------------------
 

-The DigitalMars compiler is a free succssor to the Symantec compiler
+The DigitalMars compiler is a free successor to the Symantec compiler

 and can be downloaded from http://www.digitalmars.com/
 and can be downloaded from http://www.digitalmars.com/

-   
+

 1. You need to download and unzip in turn (later packages will overwrite
    older files)
       Digital Mars C/C++ Compiler Version 8.40 or later
 1. You need to download and unzip in turn (later packages will overwrite
    older files)
       Digital Mars C/C++ Compiler Version 8.40 or later


@@ -636,17 +637,17 @@ and remove the check for Digital Mars in it (search for __DMC__).
 
 16-bit compilation is no longer supported.
 
 
 16-bit compilation is no longer supported.
 

-Configuring the build
+Configuring the Build

 ================================================================
 
 ================================================================
 

-So far the instructions only explained how to build release DLLs of wxWidgets
+So far the instructions only explain how to build release DLLs of wxWidgets

 and did not cover any configuration. It is possible to change many aspects of
 the build, including debug/release and ANSI/Unicode settings. All makefiles in
 build\msw directory use same options (with a few exceptions documented below)
 and the only difference between them is in object files and library directory
 names and in make invocation command.
 
 and did not cover any configuration. It is possible to change many aspects of
 the build, including debug/release and ANSI/Unicode settings. All makefiles in
 build\msw directory use same options (with a few exceptions documented below)
 and the only difference between them is in object files and library directory
 names and in make invocation command.
 

-Changing the settings
+Changing the Settings

 ----------------------------------------------------------------
 
 There are two ways to modify the settings: either by passing the values as
 ----------------------------------------------------------------
 
 There are two ways to modify the settings: either by passing the values as


@@ -689,13 +690,13 @@ Cygwin using configure:
 Brief explanation of options and possible values is in every
 build\msw\config.* file; more detailed description follows.
 
 Brief explanation of options and possible values is in every
 build\msw\config.* file; more detailed description follows.
 

-Basic options
+Basic Options

 ----------------------------------------------------------------
 
 BUILD=release
 ----------------------------------------------------------------
 
 BUILD=release

-  Builds release version of the library. It differs from default 'debug' 
+  Builds release version of the library. It differs from default 'debug'

   in lack of appended 'd' in name of library, does not define __WXDEBUG__
   in lack of appended 'd' in name of library, does not define __WXDEBUG__

-  and not include debug information compiled into object files and the 
+  and not include debug information compiled into object files and the

   executable.
 
 SHARED=1
   executable.
 
 SHARED=1


@@ -714,11 +715,11 @@ WXUNIV=1
   Build wxUniversal instead of native wxMSW (see
   http://www.wxwidgets.org/wxuniv.htm for more information).
 
   Build wxUniversal instead of native wxMSW (see
   http://www.wxwidgets.org/wxuniv.htm for more information).
 

-Advanced options
+Advanced Options

 ----------------------------------------------------------------
 
 MONOLITHIC=1
 ----------------------------------------------------------------
 
 MONOLITHIC=1

-  Starting with version 2.5.1, wxWidgets has the ability to be built as 
+  Starting with version 2.5.1, wxWidgets has the ability to be built as

   several smaller libraries instead of single big one as used to be the case
   in 2.4 and older versions. This is called "multilib build" and is the
   default behaviour of makefiles. You can still build single library
   several smaller libraries instead of single big one as used to be the case
   in 2.4 and older versions. This is called "multilib build" and is the
   default behaviour of makefiles. You can still build single library


@@ -800,17 +801,17 @@ COMPILER_PREFIX=<string>
   If you build with multiple versions of the same compiler, you can put
   their outputs into directories like "vc6_lib", "vc8_lib" etc. instead of
   "vc_lib" by setting this variable to e.g. "vc6". This is merely a
   If you build with multiple versions of the same compiler, you can put
   their outputs into directories like "vc6_lib", "vc8_lib" etc. instead of
   "vc_lib" by setting this variable to e.g. "vc6". This is merely a

-  convenience variable, you can achieve the same effect (but different dir
-  names) with the CFG option.
+  convenience variable, you can achieve the same effect (but different 
+  directory names) with the CFG option.

 
 
 
 

-Compiler specific options
+Compiler-Specific Options

 ----------------------------------------------------------------
 
 * MinGW
 
 If you are using gcc-2.95 instead of gcc3, you must set GCC_VERSION to
 ----------------------------------------------------------------
 
 * MinGW
 
 If you are using gcc-2.95 instead of gcc3, you must set GCC_VERSION to

-2.95. In build\msw\config.gcc, change 
+2.95. In build\msw\config.gcc, change

 > GCC_VERSION = 3
 to
 > GCC_VERSION = 2.95
 > GCC_VERSION = 3
 to
 > GCC_VERSION = 2.95


@@ -826,7 +827,7 @@ DEBUG_RUNTIME_LIBS=1
   customers and still have usable .pdb files with debug information) and this
   setting makes it possible.
 
   customers and still have usable .pdb files with debug information) and this
   setting makes it possible.
 

-Fine-tuning the compiler
+Fine-tuning the Compiler

 ----------------------------------------------------------------
 
 All makefiles have variables that you can use to specify additional options
 ----------------------------------------------------------------
 
 All makefiles have variables that you can use to specify additional options


@@ -834,21 +835,21 @@ passed to the compiler or linker. You won't need this in most cases, but if you
 do, simply add desired flags to CFLAGS (for C compiler), CXXFLAGS (for C++
 compiler), CPPFLAGS (for both C and C++ compiler) and LDFLAGS (the linker).
 
 do, simply add desired flags to CFLAGS (for C compiler), CXXFLAGS (for C++
 compiler), CPPFLAGS (for both C and C++ compiler) and LDFLAGS (the linker).
 

-Object and library directories
+Object and Library Directories

 ----------------------------------------------------------------
 
 ----------------------------------------------------------------
 

-All object files produced during library build are stored in a directory under
-build\msw. It's name is derived from build settings and CFG variable and from
-compiler name. Examples of directory names:
+All object files produced during a library build are stored in a directory under
+build\msw. Its name is derived from the build settings and CFG variable and from
+the compiler name. Examples of directory names:

 
   build\msw\bcc_msw            SHARED=0
   build\msw\bcc_mswdll         SHARED=1
   build\msw\bcc_mswunivd       SHARED=0, WXUNIV=1, BUILD=debug
   build\msw\vc_mswunivd        ditto, with Visual C++
 
 
   build\msw\bcc_msw            SHARED=0
   build\msw\bcc_mswdll         SHARED=1
   build\msw\bcc_mswunivd       SHARED=0, WXUNIV=1, BUILD=debug
   build\msw\vc_mswunivd        ditto, with Visual C++
 

-Libraries and DLLs are copied into subdirectory of lib directory with 
-name derived from compiler and static/DLL setting and setup.h into directory
-with name that contains other settings:
+Libraries and DLLs are copied into a subdirectory of the lib directory with a
+name derived from the compiler and a static/DLL setting and setup.h into a
+directory with a name that contains other settings:

 
   lib\bcc_msw
   lib\bcc_lib\msw\wx\setup.h
 
   lib\bcc_msw
   lib\bcc_lib\msw\wx\setup.h


@@ -867,7 +868,7 @@ to setup.h, you should do them in this file, _not_ in include\wx\msw\setup.h.
 
 If you set CFG to something, the value is appended to directory names. E.g.
 for CFG=MyBuild, you'll have object files in
 
 If you set CFG to something, the value is appended to directory names. E.g.
 for CFG=MyBuild, you'll have object files in

-  
+

   build\msw\bcc_mswMyBuild
   build\msw\bcc_mswdllMyBuild
   etc.
   build\msw\bcc_mswMyBuild
   build\msw\bcc_mswdllMyBuild
   etc.


@@ -879,8 +880,8 @@ and libraries in
   etc.
 
 By now it is clear what CFG is for: builds with different CFG settings don't
   etc.
 
 By now it is clear what CFG is for: builds with different CFG settings don't

-share any files and they use different setup.h files. This allows you to e.g. 
-have two static debug builds, one with wxUSE_SOCKETS=0 and one with sockets
+share any files and they use different setup.h files. For example, this allows
+you to have two static debug builds, one with wxUSE_SOCKETS=0 and one with sockets

 enabled (without CFG, both of them would be put into same directory and there
 would be conflicts between the files).
 
 enabled (without CFG, both of them would be put into same directory and there
 would be conflicts between the files).