Corrected several problems that prevented OPTS=symbols from building

properly. [Patch 707792] Thanks to Joe Mistachkin for the fixes.

3 files changed, 24 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 21f5b1b..94111b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-22  Kevin Kenny  <kennykb@acm.org>
+
+	* win/makefile.vc:
+	* win/rules.vc: Corrected several problems that prevented
+	OPTS=symbols from building properly. [Patch 707792] Thanks
+	to Joe Mistachkin for the fixes.
+	
 2003-03-20  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/tkMacOSXApplication.r (removed):
diff --git a/win/makefile.vc b/win/makefile.vc
index f79188f..f5ac297 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2002 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.69 2003/03/11 23:31:55 kennykb Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.70 2003/03/23 02:17:44 kennykb Exp $
 #------------------------------------------------------------------------------
 
 !if "$(MSVCDIR)" == ""
@@ -373,9 +373,17 @@ cflags = $(cflags) -QIA64_Bx
 !endif
 
 !if $(MSVCRT)
-crt = -MD$(DBGX)
+!if "$(DBGX)" == ""
+crt = -MD
 !else
-crt = -MT$(DBGX)
+crt = -MDd
+!endif
+!else
+!if "$(DBGX)" == ""
+crt = -MT
+!else
+crt = -MTd
+!endif
 !endif
 
 BASE_CLFAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
@@ -450,9 +458,9 @@ test: setup $(TKTEST) $(TKLIB) $(CAT32)
 	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
 !endif
 !if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
-	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
+	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
 !else
-	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
+	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
 !endif
 
 runtest: setup $(TKTEST) $(TKLIB) $(CAT32)
diff --git a/win/rules.vc b/win/rules.vc
index 342e1c0..305bc42 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -10,7 +10,7 @@
 # Copyright (c) 2001-2002 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.6 2003/03/06 03:08:40 davygrvy Exp $
+# RCS: @(#) $Id: rules.vc,v 1.7 2003/03/23 02:17:44 kennykb Exp $
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
@@ -192,15 +192,15 @@ TCL_USE_STATIC_PACKAGES = 0
 # by accident.
 #----------------------------------------------------------
 
-SUFX	    = tsdx
+SUFX	    = tsgx
 
 !if $(DEBUG)
 BUILDDIRTOP = Debug
-DBGX	    = d
+DBGX	    = g
 !else
 BUILDDIRTOP = Release
 DBGX	    =
-SUFX	    = $(SUFX:d=)
+SUFX	    = $(SUFX:g=)
 !endif
 
 TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX