From: Steve Peters <steve@fisharerojo.org>
Date: Wed, 15 Mar 2006 12:34:10 +0000 (+0000)
Subject: Additions to README.win32 and win32/Makefile based on comments from
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=84b05a714d9eab058b6b7a5bcad85b5170dfa88c;p=p5sagit%2Fp5-mst-13.2.git

Additions to README.win32 and win32/Makefile based on comments from
Steve Hay.

p4raw-id: //depot/perl@27503
---

diff --git a/README.win32 b/README.win32
index 0397d79..066a6dc 100644
--- a/README.win32
+++ b/README.win32
@@ -54,6 +54,8 @@ Command Line Tools" and is the same compiler that ships with the full
 "Borland C++ Builder" product.  The Microsoft compiler is available as
 "Visual C++ Toolkit 2003", and also as part of the ".NET Framework SDK", and
 is the same compiler that ships with "Visual Studio .NET 2003 Professional".
+Currently, Perl cannot be compiled with Visual C++ 8.0, which is part of the
+.NET 2.0 Framework SDK and Visual Studio 2005.  
 
 This port can also be built on the Intel IA64 using:
 
diff --git a/win32/Makefile b/win32/Makefile
index d93eb02..775f0be 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -102,7 +102,7 @@ CCTYPE		= MSVC60
 #CCTYPE		= MSVC70
 # Visual C++ Toolkit 2005 (free version of Visual C++ 8.x command-line tools)
 #CCTYPE		= MSVC80FREE
-# Visual C++ 8.x (aka Visual Studio .NET 2003) (full version)
+# Visual C++ 8.x (aka Visual Studio 2005) (full version)
 #CCTYPE		= MSVC80
 
 #
@@ -500,9 +500,9 @@ CONFIGPM	= ..\lib\Config.pm ..\lib\Config_heavy.pl
 MINIMOD		= ..\lib\ExtUtils\Miniperl.pm
 X2P		= ..\x2p\a2p.exe
   
-# With .NET 1.1 and 2.0, setargs.obj is not available with the .NET SDK.  It
-# only comes with Visual Studio 2003 and Visual Studio 2005.
-!IF "$(CCTYPE)" != "MSVC70FREE" && "$(CCTYPE)" != "MSVC80FREE"
+# With the .NET 2.0 SDK, setargs.obj is not available with the .NET SDK.  It
+# only comes with Visual Studio 2005.
+!IF "$(CCTYPE)" != "MSVC80FREE"
 GLOBEXEBUILD         = 
 !ENDIF