diff options
| author | dgp <dgp@users.sourceforge.net> | 2022-10-27 00:21:08 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2022-10-27 00:21:08 (GMT) |
| commit | 6e31c76fb593de7fa92ea95abbc35b65e46decf8 (patch) | |
| tree | 47e8c7c53abbbf49154a8e5aca41a27b60284e78 /win | |
| parent | a77ee23ce2c80e809b4687411bf25b49f036e5ef (diff) | |
| parent | 27f09fdb5ced601cb23ffc86b882c29a3ee7dd21 (diff) | |
| download | tcl-6e31c76fb593de7fa92ea95abbc35b65e46decf8.zip tcl-6e31c76fb593de7fa92ea95abbc35b65e46decf8.tar.gz tcl-6e31c76fb593de7fa92ea95abbc35b65e46decf8.tar.bz2 | |
merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/rules.vc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 73387e3..8e15849 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -746,8 +746,8 @@ install-libraries: libraries install-tzdata install-msgs @$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"; @echo "Installing package tcltest 2.5.5 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm"; - @echo "Installing package platform 1.0.18 as a Tcl Module"; - @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm"; + @echo "Installing package platform 1.0.19 as a Tcl Module"; + @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"; @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"; @echo "Installing encodings"; diff --git a/win/rules.vc b/win/rules.vc index fdc68e0..8d28b10 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -707,7 +707,7 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg !if defined(_TK_H)
!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
- && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
+ && [nmakehlp -V $(_TK_H) "define TK_MAJOR_VERSION" >> versions.vc]
!endif
!if [echo TK_MINOR_VERSION = \>> versions.vc] \
&& [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
|