diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-07 10:22:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-07 10:22:09 (GMT) |
| commit | a01643e73b5c590d77038e45206e8ee124a75dec (patch) | |
| tree | 345ba78287d3a5939c0863554b3ebb1144b5538d /win/rules.vc | |
| parent | 52005c65befb5b8e6ebfdf0076ce6721d75ec145 (diff) | |
| parent | 06813163a831a73bcdd74a5341bbc547fbb3e342 (diff) | |
| download | tcl-a01643e73b5c590d77038e45206e8ee124a75dec.zip tcl-a01643e73b5c590d77038e45206e8ee124a75dec.tar.gz tcl-a01643e73b5c590d77038e45206e8ee124a75dec.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 11 |
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)
|