summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-01-20 12:18:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-01-20 12:18:34 (GMT)
commit12d3b15f307754ea15cceabd761e0f60346e9cc4 (patch)
treec48c3357dc1e489cf8cb57364efb34737714e89c /win/rules.vc
parent668c35bfc263a4e42679779e17e923f019e67f15 (diff)
parenteb5163d9e84de6a1729a8db57f5db27c541ae4ee (diff)
downloadtcl-12d3b15f307754ea15cceabd761e0f60346e9cc4.zip
tcl-12d3b15f307754ea15cceabd761e0f60346e9cc4.tar.gz
tcl-12d3b15f307754ea15cceabd761e0f60346e9cc4.tar.bz2
Implementation of TIP #542: Support for switchable Full Unicode support
Diffstat (limited to 'win/rules.vc')
-rw-r--r--win/rules.vc10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 064823b..5060805 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -686,7 +686,7 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg
# configuration (ignored for Tcl itself)
# _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
# (CRT library should support this)
-# TCL_UTF_MAX=6 - forces a build using 32-bit Tcl_UniChar in stead of 16-bit.
+# TCL_UTF_MAX=4 - forces a build allowing 4-byte UTF-8 sequences internally.
# Further, LINKERFLAGS are modified based on above.
# Default values for all the above
@@ -761,8 +761,8 @@ _USE_64BIT_TIME_T = 1
!endif
!if [nmakehlp -f $(OPTS) "utfmax"]
-!message *** Force 32-bit Tcl_UniChar
-TCL_UTF_MAX = 6
+!message *** Force allowing 4-byte UTF-8 sequences internally
+TCL_UTF_MAX = 4
!endif
# Yes, it's weird that the "symbols" option controls DEBUG and
@@ -1363,8 +1363,8 @@ OPTDEFINES = $(OPTDEFINES) /DNO_STRTOI64=1
!if "$(_USE_64BIT_TIME_T)" == "1"
OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
!endif
-!if "$(TCL_UTF_MAX)" == "6"
-OPTDEFINES = $(OPTDEFINES) /DTCL_UTF_MAX=6
+!if "$(TCL_UTF_MAX)" == "4"
+OPTDEFINES = $(OPTDEFINES) /DTCL_UTF_MAX=4
!endif
# _ATL_XP_TARGETING - Newer SDK's need this to build for XP