From 546165585c006c1b86a25fbc88ee6843ba15dffb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 15 Oct 2020 13:05:20 +0000
Subject: Remove use of CFG_ENCODING from rules.vc/makefile.vc: It will become
 obsolete with TIP #587. In stead, move the default handling to tclPkgConfig.c
 for now

---
 generic/tclPkgConfig.c |  8 ++++++++
 win/makefile.vc        |  4 ----
 win/rules.vc           | 11 ++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/generic/tclPkgConfig.c b/generic/tclPkgConfig.c
index 466d535..727e872 100644
--- a/generic/tclPkgConfig.c
+++ b/generic/tclPkgConfig.c
@@ -35,6 +35,14 @@
 
 #include "tclInt.h"
 
+#ifndef TCL_CFGVAL_ENCODING
+#   ifdef _WIN32
+#	define TCL_CFGVAL_ENCODING "cp1252"
+#   else
+#	define TCL_CFGVAL_ENCODING "iso8859-1"
+#   endif
+#endif
+
 /*
  * Use C preprocessor statements to define the various values for the embedded
  * configuration information.
diff --git a/win/makefile.vc b/win/makefile.vc
index acdb3a6..99cae58 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -114,10 +114,6 @@
 #	TESTPAT=<file>
 #		Reads the tests requested to be run from this file.
 #
-#	CFG_ENCODING=encoding
-#		name of encoding for configuration information. Defaults
-#		to cp1252
-#
 # Examples:
 #       c:\tcl_src\win\>nmake -f makefile.vc release
 #       c:\tcl_src\win\>nmake -f makefile.vc test
diff --git a/win/rules.vc b/win/rules.vc
index 6dca6d9..f3e5439 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -415,9 +415,6 @@ _INSTALLDIR=$(_INSTALLDIR)\lib
 # NATIVE_ARCH - set to IX86 or AMD64 for the host machine
 # MACHINE - same as $(ARCH) - legacy
 # _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed
-# CFG_ENCODING - set to an character encoding.
-#   TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't
-#   see where it is used
 
 cc32		= $(CC)   # built-in default.
 link32		= link
@@ -503,10 +500,6 @@ _VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -ou
 _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
 !endif
 
-!ifndef CFG_ENCODING
-CFG_ENCODING	= \"cp1252\"
-!endif
-
 ################################################################
 # 4. Build the nmakehlp program
 # This is a helper app we need to overcome nmake's limiting
@@ -1043,7 +1036,7 @@ BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
 BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
 !endif
 
-!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
+!if !$(DEBUG) || $(TCL_VERSION) > 86 || $(DEBUG) && $(UNCHECKED)
 SUFX	    = $(SUFX:g=)
 !endif
 
@@ -1292,7 +1285,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # baselibs - minimum Windows libraries required. Parent makefile can
 #    define PRJ_LIBS before including rules.rc if additional libs are needed
 
-OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
+OPTDEFINES	= /DSTDC_HEADERS
 !if $(VCVERSION) >= 1600
 OPTDEFINES	= $(OPTDEFINES) /DHAVE_STDINT_H=1
 !else
-- 
cgit v0.12