diff options
| author | patthoyts <patthoyts@noemail.net> | 2003-10-14 15:35:50 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@noemail.net> | 2003-10-14 15:35:50 (GMT) |
| commit | 6f05ba3ed893d97600110ed37a859297c137728f (patch) | |
| tree | 63c637aacb46feeb4a00e2d25944ade18e6b33d3 /win/makefile.vc | |
| parent | 1053f8391d9b08e23c5dbb1012606731eaa155b6 (diff) | |
| download | tk-6f05ba3ed893d97600110ed37a859297c137728f.zip tk-6f05ba3ed893d97600110ed37a859297c137728f.tar.gz tk-6f05ba3ed893d97600110ed37a859297c137728f.tar.bz2 | |
* win/makefile.vc: Applied patches from tcl bug #801467 from
* win/winMain.c: Joe Mistachkin
FossilOrigin-Name: 61f443b1d6f0094d96611654658cf411d833e91b
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 73e52fa..7928fc6 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,12 +12,12 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.73 2003/09/26 23:59:26 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.74 2003/10/14 15:35:52 patthoyts Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" MSG = ^ -You'll need to run vcvars32.bat from Developer Studio, first, to setup^ +You will need to run vcvars32.bat from Developer Studio, first, to setup^ the environment. Jump to this line to read the new instructions. !error $(MSG) !endif @@ -391,6 +391,7 @@ BASE_CLFAGS = $(cdebug) $(cflags) $(crt) $(TK_INCLUDES) TK_CFLAGS = $(BASE_CLFAGS) $(TK_DEFINES) -DUSE_TCL_STUBS CON_CFLAGS = $(cdebug) $(cflags) $(crt) -DCONSOLE WISH_CFLAGS = $(BASE_CLFAGS) $(TK_DEFINES) +STUB_CFLAGS = $(cflags) $(cdebug) $(TK_DEFINES) #--------------------------------------------------------------------- @@ -700,10 +701,10 @@ $(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c # and no reference made to a C runtime. $(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c - $(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $? + $(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $? $(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c - $(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $? + $(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $? #--------------------------------------------------------------------- |