Posted to tcl by venks at Sun Oct 02 19:32:02 GMT 2016view raw
- Index: win/makefile.vc
- ==================================================================
- --- win/makefile.vc
- +++ win/makefile.vc
- @@ -734,37 +734,39 @@
- # NOTE: you can define HHC on the command-line to override this
- !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
- 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
- + -$(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]
- contents.htm
- docs.css
- -Keywords
- -TclCmd
- -TclLib
- -TkCmd
- -TkLib
- -UserCmd
- +Keywords\*.htm
- +TclCmd\*.htm
- +TclLib\*.htm
- +TkCmd\*.htm
- +TkLib\*.htm
- +UserCmd\*.htm
- <<
- chmsetup:
- @if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
- Index: win/rules.vc
- ==================================================================
- --- win/rules.vc
- +++ win/rules.vc
- @@ -228,18 +228,23 @@
- !message *** Doing static
- 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
- !else
- !if !$(STATIC_BUILD)
- MSVCRT = 1
- !else
- MSVCRT = 0
- +!endif
- !endif
- !endif
- !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
- !message *** Doing staticpkg
- TCL_USE_STATIC_PACKAGES = 1