Merge 8.6

win/makefile.vc

@@ -17,7 +17,7 @@
 # General usage:
 #   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]
 #
-# For MACRODEF, see TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md)
+# For MACRODEF, see TIP 477 (https://core.tcl-lang.org/tips/doc/main/tip/477.md)
 # or examine Sections 7-9 in rules.vc. This makefile has the following
 # values for the OPTS macro in addition to the ones described there.
 #       noembed  = Embeds Tcl scripts into the wish executable. Currently only
@@ -32,7 +32,7 @@
 #	core     -- Only builds the core [tkXX.(dll|lib)].
 #	all      -- Builds everything.
 #	test     -- Builds and runs the test suite.
-#	tktest   -- Just builds the binaries for the test suite.
+#	tktest   -- Just builds the test shell.
 #	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
 #		    as the root of the install tree.
 #	cwish    -- Builds a console version of wish.
@@ -85,8 +85,6 @@ DEFAULT_BUILD_TARGET = release
 # We have a custom resource file
 RCFILE = tk.rc
 
-USE_WIDECHAR_API  = 0
-
 # The rules.vc file does much of the hard work in terms of defining
 # the build configuration, macros, output directories etc.
 !include "rules-ext.vc"