diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/makefile.vc | 8 | ||||
| -rw-r--r-- | win/nmakehlp.c | 6 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2007-02-09 Joe Mistachkin <joe@mistachkin.com> + + * win/nmakehlp.c: Properly cleanup after nmakehlp, including the + * win/makefile.vc: vcX0.pch file. Sync up fixed nmakehlp usage + from Tcl. + 2007-02-06 Joe English <jenglish@users.sourceforge.net> * library/ttk/ttk.tcl: Add no-op [package ifneeded] script diff --git a/win/makefile.vc b/win/makefile.vc index 5b33f4e..98c469e 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.99 2007/01/19 09:00:30 mistachkin Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.100 2007/02/09 06:54:33 mistachkin Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -997,6 +997,12 @@ 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 hose: @echo Hosing $(OUT_DIR)\* ... diff --git a/win/nmakehlp.c b/win/nmakehlp.c index a84ee28..b2dde3f 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.6 2006/10/19 00:48:25 patthoyts Exp $ + * RCS: @(#) $Id: nmakehlp.c,v 1.7 2007/02/09 06:54:33 mistachkin Exp $ * ---------------------------------------------------------------------------- */ @@ -134,7 +134,7 @@ main( } } chars = snprintf(msg, sizeof(msg) - 1, - "usage: %s -c|-l|-f ...\n" + "usage: %s -c|-l|-f|-g|-V ...\n" "This is a little helper app to equalize shell differences between WinNT and\n" "Win9x and get nmake.exe to accomplish its job.\n", argv[0]); @@ -193,7 +193,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 |