diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-13 13:44:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-13 13:44:33 (GMT) |
| commit | 0b6db319f0ee6a542c2d1ad6f46b587211f882d2 (patch) | |
| tree | 352f6fb8eb48b316ea0d8883133927707a48a421 | |
| parent | 06464aa3be62088cc3c99fc744dd28e8413958d5 (diff) | |
| download | tcl-0b6db319f0ee6a542c2d1ad6f46b587211f882d2.zip tcl-0b6db319f0ee6a542c2d1ad6f46b587211f882d2.tar.gz tcl-0b6db319f0ee6a542c2d1ad6f46b587211f882d2.tar.bz2 | |
Update to latest "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)
|