diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-20 14:19:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-20 14:19:47 (GMT) |
| commit | 8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7 (patch) | |
| tree | 76766700a957612731a3f874580f69cd4fbed17b /win/rules.vc | |
| parent | 041d53289bc378deaabc7600ef8e79e5e6c4d8e9 (diff) | |
| parent | 12d3b15f307754ea15cceabd761e0f60346e9cc4 (diff) | |
| download | tcl-8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7.zip tcl-8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7.tar.gz tcl-8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/rules.vc b/win/rules.vc index 8fc8864..d1d8581 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -684,7 +684,7 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg # USE_STUBS - 1 -> compile to use stubs interfaces, 0 -> direct linking
# CONFIG_CHECK - 1 -> check current build configuration against Tcl
# configuration (ignored for Tcl itself)
-# 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
@@ -754,8 +754,8 @@ USE_THREAD_ALLOC= 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
@@ -1353,8 +1353,8 @@ OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_DO64BIT OPTDEFINES = $(OPTDEFINES) /DNO_STRTOI64=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
|