2 files changed, 10 insertions, 49 deletions
diff --git a/cpp/INSTALL.WINDOWS b/cpp/INSTALL.WINDOWS
index 5ca4df191e1..9fc5d7fce33 100644
--- a/cpp/INSTALL.WINDOWS
+++ b/cpp/INSTALL.WINDOWS
@@ -77,33 +77,19 @@ The following C++ compilers are supported:
 - CodeGear C++Builder 2007 R2 with December 2007 Update
 
 
-Visual C++ 2005 Express SP1 Setup
+Visual C++ Express/C++Builder Setup
 ---------------------------------
 
-Users of Visual C++ 2005 Express SP1 need to install the Microsoft
-Platform SDK:
+Users of Visual C++ 2005 Express SP1, Visual C++ 2008 Express and
+C++Builder 2007 need to install the Microsoft Platform SDK:
 
-  http://www.microsoft.com/Downloads/details.aspx?FamilyID=484269e2-3b89-47e3-8eb7-1f2be6d7123a&displaylang=en
+  http://www.microsoft.com/Downloads/details.aspx?familyid=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en
 
-Once installed, follow the instructions at the link below:
-
-  http://msdn2.microsoft.com/en-us/express/aa700755.aspx
-
-You also need to add the Platform SDK directories to the INCLUDE, LIB
-and PATH environment variables. For example:
-
-@SET PDK_HOME=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2
-@SET PATH=%PDK_HOME%\bin;%PATH%
-@SET INCLUDE=%PDK_HOME%\include;%INCLUDE%
-@SET LIB=%PDK_HOME%\lib;%LIB%
-
-The PDK_HOME environment variable must be defined in order to build
-the Ice source distribution. Note that PDK_HOME must not contain a
-trailing backslash (\).
+Once installed, you need to add the Platform SDK directories to the
+INCLUDE, LIB and PATH environment variables. This can be done by
+executing the following script from within the compiler command prompt:
 
-You may also need to execute the vsvars32.bat script, located in
-C:\Program Files\Microsoft Visual Studio 8\Common7\Tools, to properly
-configure your build environment.
+  C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\SetEnv.Cmd
 
 
 Visual C++ 6.0 Setup
@@ -136,24 +122,6 @@ This Platform SDK is only required to compile Ice and is not necessary
 to build applications using Ice.
 
 
-NMAKE and Message Compiler (MC.EXE)
------------------------------------
-
-In order to build Ice, you will need the Microsoft NMAKE and Message
-Compiler utilities. These are included in all full Microsoft C++
-compiler distributions. If you are using C++Builder or Visual C++ 2008
-Express, you can download them as part of the Windows Server 2003 R2
-Platform SDK:
- 
-  http://www.microsoft.com/Downloads/details.aspx?FamilyID=484269e2-3b89-47e3-8eb7-1f2be6d7123a&displaylang=en
-
-Once installed, you need to add the Platform SDK directories to the
-INCLUDE and PATH environment variables. This can be done by executing
-the following script:
-
-  C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\SetEnv.Cmd
-
-
 Third-party libraries
 ---------------------
 
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 5075b91d97c..9f04a703fe8 100644
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -53,18 +53,11 @@ THIRDPARTY_HOME		= C:\Ice-$(VERSION)-ThirdParty-$(THIRDPARTY_HOME_EXT)
 !endif
 
 #
-# For VC80 and VC80 Express it is necessary to set the location of the
-# manifest tool. This must be the 6.x version of mt.exe, not the 5.x
-# version!
-#
-# For VC80 Express mt.exe 6.x is provided by the Windows Platform SDK. 
-# It is necessary to set the location of the Platform SDK through the
-# PDK_HOME environment variable (see INSTALL.WINDOWS for details).
+# For VC80 it is necessary to set the location of the manifest tool.
+# This must be the 6.x version of mt.exe, not the 5.x # version!
 #
 !if "$(CPP_COMPILER)" == "VC80"
 MT = "$(VS80COMNTOOLS)bin\mt.exe"
-!elseif "$(CPP_COMPILER)" == "VC80_EXPRESS"
-MT = "$(PDK_HOME)\bin\mt.exe"
 !else
 MT = mt.exe
 !endif