* win/makefile.vc: clarify necessary defined vars that can come

	from MSVC or the Platform SDK.

2 files changed, 25 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index e0e5f76..ee63644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-08  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* win/tkWinWm.c (WinSetIcon): fix GCLP_ICONSM -> GCLP_HICONSM.
+
+	* win/makefile.vc: clarify necessary defined vars that can come
+	from MSVC or the Platform SDK.
+
 2005-02-28  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* win/tkWinX.c (GenerateXEvent): correct %A translation on
diff --git a/win/makefile.vc b/win/makefile.vc
index aa69154..3fe87c1 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -8,36 +8,40 @@
 # 
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-2000 Ajuba Solutions.
-# Copyright (c) 2001 ActiveState Corporation.
+# Copyright (c) 2001-2005 ActiveState Corporation.
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.88 2004/11/26 20:53:26 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.89 2005/03/08 21:55:49 hobbs Exp $
 #------------------------------------------------------------------------------
 
-!if !defined(MSDEVDIR) && !defined(MSVCDIR)
+# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
+# or with the MS Platform SDK (MSSDK)
+!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK)
 MSG = ^
-You will need to run vcvars32.bat from Developer Studio, first, to setup^
-the environment.  Jump to this line to read the new instructions.
+You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
+Platform SDK first to setup the environment.  Jump to this line to read^
+the build instructions.
 !error $(MSG)
 !endif
 
 #------------------------------------------------------------------------------
 # HOW TO USE this makefile:
 #
-# 1)  It is now necessary to have MSVCDir set in the environment.  This is used
-#     as a check to see if vcvars32.bat had been run prior to running nmake or
-#     during the install of Microsoft Developer Studio, MSVCDir had been set
-#     globally and the PATH adjusted.  Either way is valid.
+# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the
+#     environment.  This is used as a check to see if vcvars32.bat had been
+#     run prior to running nmake or during the installation of Microsoft
+#     Visual C++, MSVCDir had been set globally and the PATH adjusted.
+#     Either way is valid.
 #
 #     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
-#     directory to setup the proper environment, if needed, for your current
-#     setup.  This is a needed bootstrap requirement and allows the swapping of
-#     different environments to be easier.
+#     directory to setup the proper environment, if needed, for your
+#     current setup.  This is a needed bootstrap requirement and allows the
+#     swapping of different environments to be easier.
 #
 # 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
-#     vcvars32.bat according to the instructions for it.  This can also turn on
-#     the 64-bit compiler, if your SDK has it.
+#     vcvars32.bat according to the instructions for it.  This can also
+#     turn on the 64-bit compiler, if your SDK has it.
 #
 # 3)  Targets are:
 #	release  -- builds the core, the shell. (default)