diff options
| author | davygrvy <davygrvy> | 2004-09-16 17:52:08 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2004-09-16 17:52:08 (GMT) |
| commit | 79f7ee48d3802961680fedc40ee6de76f230344b (patch) | |
| tree | 391ae5b95bcdc5437bc143d21c4937cdf238d297 /win/makefile.vc | |
| parent | f614b7b595c28a0f7e7fe566ddbec9d898d839f5 (diff) | |
| download | tk-79f7ee48d3802961680fedc40ee6de76f230344b.zip tk-79f7ee48d3802961680fedc40ee6de76f230344b.tar.gz tk-79f7ee48d3802961680fedc40ee6de76f230344b.tar.bz2 | |
added VC7-safe environment check used in the Tcl makefile.vc
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 118db27..51c254a 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,10 +12,10 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.85 2004/09/10 12:32:24 vincentdarley Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.86 2004/09/16 17:52:08 davygrvy Exp $ #------------------------------------------------------------------------------ -!if "$(MSDEVDIR)" == "" +!if !defined(MSDEVDIR) && !defined(MSVCDIR) MSG = ^ You will need to run vcvars32.bat from Developer Studio, first, to setup^ the environment. Jump to this line to read the new instructions. @@ -193,6 +193,8 @@ WISHNAMEPREFIX = wish BINROOT = . ROOT = .. +TK_LIBRARY = $(ROOT)\library + TKIMPLIB = "$(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib" TKLIBNAME = $(PROJECT)$(VERSION)$(SUFX).$(EXT) TKLIB = "$(OUT_DIR)\$(TKLIBNAME)" @@ -485,7 +487,7 @@ tktest: setup $(TKTEST) $(CAT32) test: setup $(TKTEST) $(TKLIB) $(CAT32) set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(ROOT)/library + set TK_LIBRARY=$(TK_LIBRARY) !if $(TCLINSTALL) set PATH=$(_TCLDIR)\bin;$(PATH) !else @@ -499,7 +501,7 @@ test: setup $(TKTEST) $(TKLIB) $(CAT32) runtest: setup $(TKTEST) $(TKLIB) $(CAT32) set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(ROOT)/library + set TK_LIBRARY=$(TK_LIBRARY) !if $(TCLINSTALL) set PATH=$(_TCLDIR)\bin;$(PATH) !else @@ -509,7 +511,7 @@ runtest: setup $(TKTEST) $(TKLIB) $(CAT32) rundemo: setup $(TKTEST) $(TKLIB) $(CAT32) set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(ROOT)/library + set TK_LIBRARY=$(TK_LIBRARY) !if $(TCLINSTALL) set PATH=$(_TCLDIR)\bin;$(PATH) !else |