diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-31 08:51:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-31 08:51:37 (GMT) |
| commit | ec84d91a805145aa911a00d4b5f53a8e4513276d (patch) | |
| tree | 31b731828830c63fb6a6dc6e5d32cc74dc5df7f3 /win/rules.vc | |
| parent | d4d4aa830739f769c305b523fc4c7000c451845e (diff) | |
| parent | 3ab4e9ca24a8f7e98e3f7e3040130ba4e3caf2dc (diff) | |
| download | tcl-ec84d91a805145aa911a00d4b5f53a8e4513276d.zip tcl-ec84d91a805145aa911a00d4b5f53a8e4513276d.tar.gz tcl-ec84d91a805145aa911a00d4b5f53a8e4513276d.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/win/rules.vc b/win/rules.vc index a0cf06a..3fa0704 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -688,6 +688,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.
# Further, LINKERFLAGS are modified based on above.
# Default values for all the above
@@ -752,6 +753,11 @@ TCL_USE_STATIC_PACKAGES = 0 _USE_64BIT_TIME_T = 1
!endif
+!if [nmakehlp -f $(OPTS) "utfmax"]
+!message *** Force 32-bit Tcl_UniChar
+TCL_UTF_MAX = 6
+!endif
+
# Yes, it's weird that the "symbols" option controls DEBUG and
# the "pdbs" option controls SYMBOLS. That's historical.
!if [nmakehlp -f $(OPTS) "symbols"]
@@ -1315,6 +1321,9 @@ OPTDEFINES = $(OPTDEFINES) -DNO_STRTOI64 !if "$(_USE_64BIT_TIME_T)" == "1"
OPTDEFINES = $(OPTDEFINES) -D_USE_64BIT_TIME_T
!endif
+!if "$(TCL_UTF_MAX)" == "6"
+OPTDEFINES = $(OPTDEFINES) -DTCL_UTF_MAX=6
+!endif
# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
COMPILERFLAGS = /D_ATL_XP_TARGETING
|