diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2007-02-09 06:42:55 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2007-02-09 06:42:55 (GMT) |
| commit | 1c067fb11af9b699bf05dcb25667aece3c696d61 (patch) | |
| tree | 365ebc6c3a989c677bff38abcecf735bfa30a146 | |
| parent | 32fbfcd067b767677bcc23086c5440407c7afa9d (diff) | |
| download | tcl-1c067fb11af9b699bf05dcb25667aece3c696d61.zip tcl-1c067fb11af9b699bf05dcb25667aece3c696d61.tar.gz tcl-1c067fb11af9b699bf05dcb25667aece3c696d61.tar.bz2 | |
Windows build fixes
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/makefile.vc | 11 | ||||
| -rw-r--r-- | win/nmakehlp.c | 4 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-02-09 Joe Mistachkin <joe@mistachkin.com> + + * win/nmakehlp.c: Properly cleanup after nmakehlp, including the + * win/makefile.vc: vcX0.pch file. + 2007-02-08 Jeff Hobbs <jeffh@ActiveState.com> * unix/tclUnixInit.c (TclpCheckStackSpace): do stack size checks diff --git a/win/makefile.vc b/win/makefile.vc index 04ef0ad..9f6830e 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.159 2007/01/19 08:45:57 mistachkin Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.160 2007/02/09 06:43:00 mistachkin Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -1088,8 +1088,17 @@ tidy: clean: @echo Cleaning $(TMP_DIR)\* ... @if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR) + @echo Cleaning $(WINDIR)\nmakehlp.obj ... + @if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj + @echo Cleaning $(WINDIR)\nmakehlp.exe ... + @if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe + @echo Cleaning $(WINDIR)\_junk.pch ... + @if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch + @echo Cleaning $(WINDIR)\vercl.x ... @if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x + @echo Cleaning $(WINDIR)\vercl.i ... @if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i + @echo Cleaning $(WINDIR)\versions.vc ... @if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc hose: diff --git a/win/nmakehlp.c b/win/nmakehlp.c index 5034346..044cc8f 100644 --- a/win/nmakehlp.c +++ b/win/nmakehlp.c @@ -10,7 +10,7 @@ * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * * ---------------------------------------------------------------------------- - * RCS: @(#) $Id: nmakehlp.c,v 1.14 2007/01/19 08:17:35 mistachkin Exp $ + * RCS: @(#) $Id: nmakehlp.c,v 1.15 2007/02/09 06:43:00 mistachkin Exp $ * ---------------------------------------------------------------------------- */ @@ -207,7 +207,7 @@ CheckForCompilerFeature( * Base command line. */ - lstrcpy(cmdline, "cl.exe -nologo -c -TC -Zs -X "); + lstrcpy(cmdline, "cl.exe -nologo -c -TC -Zs -X -Fp.\\_junk.pch "); /* * Append our option for testing |