diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-25 08:47:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-25 08:47:55 (GMT) |
| commit | cb8b6e12a2cdd53e563f6b6ceec2a935cbe1a393 (patch) | |
| tree | 426f221a63fede4e9f563c44542e8f250b300a53 | |
| parent | 1dfa3c7740734521f9a728b762a54e99555b9219 (diff) | |
| parent | df727328685d1279729add16629922fdd29d3279 (diff) | |
| download | tcl-cb8b6e12a2cdd53e563f6b6ceec2a935cbe1a393.zip tcl-cb8b6e12a2cdd53e563f6b6ceec2a935cbe1a393.tar.gz tcl-cb8b6e12a2cdd53e563f6b6ceec2a935cbe1a393.tar.bz2 | |
Merge 8.6. Bug in rules.vc (visible in Tk: handle TK_MAJOR_VERSION the same as TCL_MAJOR_VERSION)
| -rw-r--r-- | library/platform/platform.tcl | 2 | ||||
| -rw-r--r-- | win/rules.vc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 00eef1c..acaebf2 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -373,7 +373,7 @@ proc ::platform::patterns {id} { } } set major 12 - set minor 6 + set minor 5 } if {$major eq 12} { # Add 12.0 to 12.minor to patterns. diff --git a/win/rules.vc b/win/rules.vc index 89a72ce..0dd6ef2 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]
|