diff options
| author | davygrvy <davygrvy> | 2003-12-23 02:59:12 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2003-12-23 02:59:12 (GMT) |
| commit | 0eec9611c788b11eb101cbe8ddfaf30bf94b3975 (patch) | |
| tree | d0943f6b756229e7348d4e2731104fed0db5b1d2 | |
| parent | 0e3a07c07d29699926cef5613c8367a3705be20b (diff) | |
| download | tk-0eec9611c788b11eb101cbe8ddfaf30bf94b3975.zip tk-0eec9611c788b11eb101cbe8ddfaf30bf94b3975.tar.gz tk-0eec9611c788b11eb101cbe8ddfaf30bf94b3975.tar.bz2 | |
Uses new features of nmakehlp to get the version strings from header files
without the use of hardcoded values.
| -rw-r--r-- | win/makefile.vc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 2c5575d..23252ad 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -9,10 +9,10 @@ # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # Copyright (c) 2001 ActiveState Corporation. -# Copyright (c) 2001-2002 David Gravereaux. +# Copyright (c) 2001-2003 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.76 2003/11/17 02:15:32 dgp Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.77 2003/12/23 02:59:12 davygrvy Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -165,17 +165,23 @@ PROJECT = tk !endif STUBPREFIX = $(PROJECT)stub -DOTVERSION = 8.5 +!if [nmakehlp -g ../generic/tk.h TK_VERSION] == 85 +DOTVERSION = 8.5 +!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 86 +DOTVERSION = 8.6 +!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 90 +DOTVERSION = 9.0 +!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 0 +MSG =^ +Can't get version string from ../generic/tk.h +!error $(MSG) +!endif VERSION = $(DOTVERSION:.=) WISHNAMEPREFIX = wish BINROOT = . ROOT = .. -#TCLIMPLIBNAME = tcl$(VERSION)$(SUFX).lib -#TCLLIB = tcl$(VERSION)$(SUFX).$(EXT) -#TCLSTUBLIBNAME = tclstub$(VERSION).lib - TKIMPLIB = "$(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib" TKLIBNAME = $(PROJECT)$(VERSION)$(SUFX).$(EXT) TKLIB = "$(OUT_DIR)\$(TKLIBNAME)" |