From 53b6bf7310b56ceb0c4d2d16a0252a3c600924b1 Mon Sep 17 00:00:00 2001
From: Joe Mistachkin <joe@mistachkin.com>
Date: Tue, 9 Aug 2016 21:03:28 +0000
Subject: Fix the 'htmlhelp' target so that it compiles cleanly and includes
 all the appropriate HTML files.

---
 win/makefile.vc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index eb9a594..7c65aea 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -747,7 +747,7 @@ htmlhelp: chmsetup $(CHMFILE)
 $(CHMFILE): $(DOCDIR)\*
 	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
 	@echo Compiling HTML help project
-	@$(HHC) <<$(HHPFILE) >NUL
+	-$(HHC) <<$(HHPFILE) >NUL
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=$(HTMLBASE).chm
@@ -758,12 +758,12 @@ Title=Tcl/Tk $(DOT_VERSION) Help
 [FILES]
 contents.htm
 docs.css
-Keywords
-TclCmd
-TclLib
-TkCmd
-TkLib
-UserCmd
+Keywords\*.htm
+TclCmd\*.htm
+TclLib\*.htm
+TkCmd\*.htm
+TkLib\*.htm
+UserCmd\*.htm
 <<
 
 chmsetup:
-- 
cgit v0.12


From 5842060393afb827aa8caa426fdd32a58e7f8005 Mon Sep 17 00:00:00 2001
From: Joe Mistachkin <joe@mistachkin.com>
Date: Wed, 10 Aug 2016 03:13:46 +0000
Subject: Set the default topic, enable full-text search, and put all help
 output files under OUT_DIR.

---
 win/makefile.vc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index 7c65aea..f401541 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -737,7 +737,7 @@ gentommath_h:
 !ifndef HHC
 HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
 !endif
-HTMLDIR=$(ROOT)\html
+HTMLDIR=$(OUT_DIR)\html
 HTMLBASE=TclTk$(VERSION)
 HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
@@ -745,14 +745,16 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 htmlhelp: chmsetup $(CHMFILE)
 
 $(CHMFILE): $(DOCDIR)\*
-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
 	@echo Compiling HTML help project
 	-$(HHC) <<$(HHPFILE) >NUL
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=$(HTMLBASE).chm
+Default topic=contents.htm
 Display compile progress=no
 Error log file=$(HTMLBASE).log
+Full-text search=Yes
 Language=0x409 English (United States)
 Title=Tcl/Tk $(DOT_VERSION) Help
 [FILES]
-- 
cgit v0.12


From 65d17884a3fc402968d737201112e8006e371434 Mon Sep 17 00:00:00 2001
From: Joe Mistachkin <joe@mistachkin.com>
Date: Mon, 19 Sep 2016 18:48:16 +0000
Subject: Permit static linking to the MSVCRT as a stand-alone option.  Enable
 WinXP SDK compatibility.

---
 win/coffbase.txt | 4 ++--
 win/rules.vc     | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/win/coffbase.txt b/win/coffbase.txt
index 3314f26..0142bb3 100644
--- a/win/coffbase.txt
+++ b/win/coffbase.txt
@@ -13,8 +13,8 @@
 ; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.
 
 tcl		0x10000000	0x00200000
-tcldde		0x10200000	0x00010000
-tclreg		0x10210000	0x00010000
+tcldde		0x10200000	0x00020000
+tclreg		0x10210000	0x00020000
 tk		0x10220000	0x00200000
 expect		0x10480000	0x00080000
 itcl		0x10500000	0x00080000
diff --git a/win/rules.vc b/win/rules.vc
index d4c2f35..cd06e96 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -159,7 +159,7 @@ DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ
 !endif
 
-COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE
+COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE -D_USING_V110_SDK71_=1
 
 # In v13 -GL and -YX are incompatible.
 !if [nmakehlp -c -YX]
@@ -230,6 +230,10 @@ STATIC_BUILD	= 1
 !else
 STATIC_BUILD	= 0
 !endif
+!if [nmakehlp -f $(OPTS) "nomsvcrt"]
+!message *** Doing nomsvcrt
+MSVCRT		= 0
+!else
 !if [nmakehlp -f $(OPTS) "msvcrt"]
 !message *** Doing msvcrt
 MSVCRT		= 1
@@ -240,6 +244,7 @@ MSVCRT		= 1
 MSVCRT		= 0
 !endif
 !endif
+!endif
 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
 !message *** Doing staticpkg
 TCL_USE_STATIC_PACKAGES	= 1
-- 
cgit v0.12