merge trunkdkf_expose_ptrgetvar

1 files changed, 16 insertions, 12 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index eb9a594..18f691b 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -113,12 +113,12 @@ the build instructions.
 #		memdbg   = Enables the debugging memory allocator.

 #

 #	CHECKS=64bit,fullwarn,nodep,none

-#		Sets special macros for checking compatability.

+#		Sets special macros for checking compatibility.

 #

 #		64bit    = Enable 64bit portability warnings (if available)

 #		fullwarn = Builds with full compiler and link warnings enabled.

 #			    Very verbose.

-#		nodep	 = Turns off compatability macros to ensure the core

+#		nodep	 = Turns off compatibility macros to ensure the core

 #			    isn't being built with deprecated functions.

 #

 #	MACHINE=(ALPHA|AMD64|IA64|IX86)

@@ -383,6 +383,7 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_div_3.obj \

 	$(TMP_DIR)\bn_mp_exch.obj \

 	$(TMP_DIR)\bn_mp_expt_d.obj \

+	$(TMP_DIR)\bn_mp_expt_d_ex.obj \

 	$(TMP_DIR)\bn_mp_grow.obj \

 	$(TMP_DIR)\bn_mp_init.obj \

 	$(TMP_DIR)\bn_mp_init_copy.obj \

@@ -503,7 +504,7 @@ crt = -MT
 !endif

 

 TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"

-TCL_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1

+TCL_DEFINES	= -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1

 BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)

 CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE

 TCL_CFLAGS	= $(BASE_CFLAGS) $(OPTDEFINES)

@@ -737,7 +738,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,25 +746,27 @@ 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:

@@ -876,6 +879,7 @@ $(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
 @SHLIB_SUFFIX@       .dll

 @DL_LIBS@

 @LDFLAGS@

+@TCL_CC_SEARCH_FLAGS@

 @TCL_LD_SEARCH_FLAGS@

 @LIBOBJS@

 @RANLIB@