summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-04-13 13:44:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-04-13 13:44:33 (GMT)
commitacac3bdbae84c16d87d607e3b44cf05609c68dee (patch)
tree352f6fb8eb48b316ea0d8883133927707a48a421 /win
parent18c971cda2cf65fae296ccd6f0f0ada966974a04 (diff)
downloadtcl-acac3bdbae84c16d87d607e3b44cf05609c68dee.zip
tcl-acac3bdbae84c16d87d607e3b44cf05609c68dee.tar.gz
tcl-acac3bdbae84c16d87d607e3b44cf05609c68dee.tar.bz2
Update to latest "rules.vc"
Diffstat (limited to 'win')
-rw-r--r--win/rules.vc11
1 files changed, 9 insertions, 2 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 2ec5292..85c37f2 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1203,9 +1203,16 @@ TCLSH_NATIVE = $(TCLSH)
!if $(DOING_TK) || $(NEED_TK)
WISHNAMEPREFIX = wish
WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe
-TKLIBNAME = $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
-TKSTUBLIBNAME = tkstub$(TK_VERSION).lib
+TKLIBNAME8 = tk$(TK_VERSION)$(SUFX).$(EXT)
+TKLIBNAME9 = tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
+!if $(TCL_MAJOR_VERSION) == 8
+TKLIBNAME = tk$(TK_VERSION)$(SUFX).$(EXT)
TKIMPLIBNAME = tk$(TK_VERSION)$(SUFX).lib
+!else
+TKLIBNAME = tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
+TKIMPLIBNAME = tcl9tk$(TK_VERSION)$(SUFX).lib
+!endif
+TKSTUBLIBNAME = tkstub$(TK_VERSION).lib
!if $(DOING_TK)
WISH = $(OUT_DIR)\$(WISHNAME)