X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/391e89ae173ee91b7e6a1344d361e1213fe530f0..f154b9fa942e19e7e3ad4ef368787aec1c530048:/docs/msw/install.txt

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index dddfac0f31..a51818d883 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -115,9 +115,9 @@ informal and more detailed description of the process summarized below.
 
 Please note that the VC++ 6.0 project files will work for VC++ .NET also.
 
-Also note that you can make the project files work with VC++ 5.0 but you'll
-need to edit .dsp file by hand before this is possible (change the version in
-the .dsp file header from 6.0 to 5.0).
+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
+download at: ftp://ftp.microsoft.com/developr/visualstudio/sp3/full.
 
 Using project files (VC++ 6 and later):
 
@@ -190,21 +190,17 @@ Microsoft Visual C++ compilation for 64-bit Windows
 ----------------------------------------------------------------
 
 Visual Studio 2005 includes 64-bit compilers, though they are not installed by
-default; you need to select them during the installation. The compilers are
-32-bit hosted and you do not need a 64-bit machine to use them, just to run the
-created executables. Visual C++ Express Edition does not include 64-bit
-compilers.
+default; you need to select them during the installation. Both native 64-bit
+compilers and 32-bit hosted cross compilers are included, so you do not need a
+64-bit machine to use them (though you do to run the created executables).
+Visual C++ Express Edition does not include 64-bit compilers.
 
-64-bit compilers are also available in various SDKs, for example the .NET
-Framework SDK:
+64-bit compilers are also available in various SDKs, for example
+the .NET Framework SDK:
     http://msdn.microsoft.com/netframework/programming/64bit/devtools/
 
 Using project files:
 
- FIXME: Currently only works with wxUSE_NO_MANIFEST set to 1. Also currently
-        you can't build both 32 and 64 bit versions of the same build at the
-        same time.
-
 1. Open the VC++ 6 workspace file: build\msw\wx.dsw. Visual Studio will then
    convert the projects to the current Visual C++ project format.
 
@@ -215,6 +211,12 @@ Using project files:
    For more detailed instructions see:
     http://msdn2.microsoft.com/en-us/library/9yb4317s(en-us,vs.80).aspx
 
+   Note: 64-bit targets created this way will use the build directory of the
+         corresponding 32-bit target for some files. Therefore after building
+         for one CPU it is necessary to clean the build before building the
+         equivalent target for another CPU. We've reported the problem to MS
+         but they say it is not possible to fix it.
+
 3. To build, go to the 'Build' menu and choose 'Batch Build...'. Tick all the
    all the 'x64|Debug' or all the 'Itanium|Debug' projects, and click 'Build'.
 
@@ -229,7 +231,7 @@ Using project files:
 Using makefiles:
 
 1. Open a 64-bit build command prompt, for either x64 or Itanium. Change
-   directory to build\msw. Then for x64 type (note upper case):
+   directory to build\msw. Then for x64 type:
 
     nmake -f makefile.vc TARGET_CPU=AMD64
 
@@ -259,10 +261,13 @@ If you receive this error add bufferoverflowu.lib to link, e.g.:
 
 See http://support.microsoft.com/?id=894573 for more information.
 
-Borland C++ 5.0/5.5 compilation
+Borland C++ compilation
 ----------------------------------------------------------------
 
-Compiling using the makefiles (updated 24 Sept 02):
+The minimum version required is 5.5, which can be downloaded for free from:
+http://www.borland.com/products/downloads/download_cbuilder.html#
+
+Compiling using the makefiles:
 
 1. Change directory to build\msw. Type 'make -f makefile.bcc' to
    make the wxWidgets core library. Ignore the compiler warnings.
@@ -285,11 +290,11 @@ recompile wxWidgets. The same applies if compiling using the IDE.
 Note (3): If you wish debug messages to be sent to the console in
 debug mode, edit makefile.bcc and change /aa to /Tpe in link commands.
 
-Compiling using the IDE files for Borland C++ 5.0: not supported - please
-use version 2.4.1 (using the make utility in commandline mode works fine_
+Cmpilation 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.
+Compiling using the IDE files for Borland C++ 5.0 and using CBuilder IDE 
+(v1-v6): not supported 
 
-Compiling using CBuilder (v1-v6): not supported - please
-use version 2.4.1 (using the make utility in commandline mode works fine_
 
 ** REMEMBER **