Add builds using TCL_UTF_MAX=4 on Windows. Not officially supported, but used by Androwish. Also alphabetise some options in win/makefile.vc and win/rules.vc

1 files changed, 20 insertions, 17 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 26f7da3..e337569 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -52,29 +52,32 @@
 # turn on the 64-bit compiler, if your SDK has it.

 #

 # Basic macros and options usable on the commandline (see rules.vc for more info):

-#	OPTS=msvcrt,static,staticpkg,symbols,nothreads,profile,unchecked,time64bit,none

+#	OPTS=msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,time64bit,unchecked,utfmax,none

 #		Sets special options for the core.  The default is for none.

 #		Any combination of the above may be used (comma separated).

 #		'none' will over-ride everything to nothing.

 #

-#		msvcrt   = Affects the static option only to switch it from

-#			   using libcmt(d) as the C runtime [by default] to

-#			   msvcrt(d). This is useful for static embedding

-#			   support.

-#		static   = Builds a static library of the core instead of a

-#			   dll.  The shell will be static (and large), as well.

-#		staticpkg= Affects the static option only to switch

-#			   tclshXX.exe to have the dde and reg extension linked

-#			   inside it.

-#		nothreads  = Turns off full multithreading support (default on).

+#		msvcrt    = Affects the static option only to switch it from

+#			    using libcmt(d) as the C runtime [by default] to

+#			    msvcrt(d). This is useful for static embedding

+#			    support.

+#		nothreads = Turns off full multithreading support (default on).

+#		pbds      =  Produce separate debug symbol files.

+#		profile   =  Adds profiling hooks.  Map file is assumed.

+#		static    = Builds a static library of the core instead of a

+#			    dll.  The shell will be static (and large), as well.

+#		staticpkg = Affects the static option only to switch

+#			    tclshXX.exe to have the dde and reg extension linked

+#			    inside it.

+#		symbols   =  Adds symbols for step debugging.

 #		thrdalloc = Use the thread allocator (shared global free pool).

-#		symbols =  Adds symbols for step debugging.

-#		profile =  Adds profiling hooks.  Map file is assumed.

-#		unchecked = Allows a symbols build to not use the debug

-#			   enabled runtime (msvcrt.dll not msvcrtd.dll

-#			   or libcmt.lib not libcmtd.lib).

 #		time64bit = Forces a build using 64-bit time_t for 32-bit build

-#			   (CRT library should support this).

+#			    (CRT library should support this).

+#		unchecked = Allows a symbols build to not use the debug

+#			    enabled runtime (msvcrt.dll not msvcrtd.dll

+#			    or libcmt.lib not libcmtd.lib).

+#		utfmax    = Forces a build allowing 4-byte UTF-8 sequences

+#			    internally.

 #

 #	STATS=compdbg,memdbg,none

 #		Sets optional memory and bytecode compiler debugging code added