diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2003-03-23 02:25:21 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2003-03-23 02:25:21 (GMT) |
| commit | f5399432ad9b9ba2f114e9883dc0ed31dbce7cb0 (patch) | |
| tree | f15bf6945627163484dc895e9d7ba89feee38439 /win | |
| parent | 2bd6e4d4896824142931fe1c97a67b3604648a03 (diff) | |
| download | tk-f5399432ad9b9ba2f114e9883dc0ed31dbce7cb0.zip tk-f5399432ad9b9ba2f114e9883dc0ed31dbce7cb0.tar.gz tk-f5399432ad9b9ba2f114e9883dc0ed31dbce7cb0.tar.bz2 | |
Corrected several problems that prevented OPTS=symbols from building
properly. [Patch 707792] Thanks to Joe Mistachkin for the fixes.
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 18 | ||||
| -rw-r--r-- | win/rules.vc | 8 |
2 files changed, 17 insertions, 9 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 7470ade..2762c4d 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.67.2.2 2003/03/13 16:41:48 kennykb Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.3 2003/03/23 02:25:21 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 62b21c4..fd4c1c7 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.5 2003/02/14 20:28:21 davygrvy Exp $ +# RCS: @(#) $Id: rules.vc,v 1.5.2.1 2003/03/23 02:25:22 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 |