Merged kennykb-numerics-branch back to the head; TIPs 132 and 232

1 files changed, 61 insertions, 3 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index b18d51e..fbcf4a1 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.136 2005/03/08 21:52:35 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.137 2005/05/10 18:35:30 kennykb Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -307,6 +307,7 @@ TCLOBJS = \
 	$(TMP_DIR)\tclResult.obj \
 	$(TMP_DIR)\tclScan.obj \
 	$(TMP_DIR)\tclStringObj.obj \
+	$(TMP_DIR)\tclStrToD.obj \
 	$(TMP_DIR)\tclStubInit.obj \
 	$(TMP_DIR)\tclStubLib.obj \
 	$(TMP_DIR)\tclThread.obj \
@@ -314,6 +315,7 @@ TCLOBJS = \
 	$(TMP_DIR)\tclThreadJoin.obj \
 	$(TMP_DIR)\tclThreadStorage.obj \
 	$(TMP_DIR)\tclTimer.obj \
+	$(TMP_DIR)\tclTomMathInterface.obj \
 	$(TMP_DIR)\tclTrace.obj \
 	$(TMP_DIR)\tclUtf.obj \
 	$(TMP_DIR)\tclUtil.obj \
@@ -332,6 +334,56 @@ TCLOBJS = \
 	$(TMP_DIR)\tclWinSock.obj \
 	$(TMP_DIR)\tclWinThrd.obj \
 	$(TMP_DIR)\tclWinTime.obj \
+	$(TMP_DIR)\bncore.obj \
+	$(TMP_DIR)\bn_reverse.obj \
+	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_add.obj \
+	$(TMP_DIR)\bn_mp_add_d.obj \
+	$(TMP_DIR)\bn_mp_clamp.obj \
+	$(TMP_DIR)\bn_mp_clear.obj \
+	$(TMP_DIR)\bn_mp_clear_multi.obj \
+	$(TMP_DIR)\bn_mp_cmp.obj \
+	$(TMP_DIR)\bn_mp_cmp_mag.obj \
+	$(TMP_DIR)\bn_mp_copy.obj \
+	$(TMP_DIR)\bn_mp_count_bits.obj \
+	$(TMP_DIR)\bn_mp_div.obj \
+	$(TMP_DIR)\bn_mp_div_d.obj \
+	$(TMP_DIR)\bn_mp_div_2.obj \
+	$(TMP_DIR)\bn_mp_div_2d.obj \
+	$(TMP_DIR)\bn_mp_div_3.obj \
+	$(TMP_DIR)\bn_mp_exch.obj \
+	$(TMP_DIR)\bn_mp_grow.obj \
+	$(TMP_DIR)\bn_mp_init.obj \
+	$(TMP_DIR)\bn_mp_init_copy.obj \
+	$(TMP_DIR)\bn_mp_init_multi.obj \
+	$(TMP_DIR)\bn_mp_init_set.obj \
+	$(TMP_DIR)\bn_mp_init_size.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \
+	$(TMP_DIR)\bn_mp_lshd.obj \
+	$(TMP_DIR)\bn_mp_mod.obj \
+	$(TMP_DIR)\bn_mp_mod_2d.obj \
+	$(TMP_DIR)\bn_mp_mul.obj \
+	$(TMP_DIR)\bn_mp_mul_2.obj \
+	$(TMP_DIR)\bn_mp_mul_2d.obj \
+	$(TMP_DIR)\bn_mp_mul_d.obj \
+	$(TMP_DIR)\bn_mp_radix_size.obj \
+	$(TMP_DIR)\bn_mp_radix_smap.obj \
+	$(TMP_DIR)\bn_mp_read_radix.obj \
+	$(TMP_DIR)\bn_mp_rshd.obj \
+	$(TMP_DIR)\bn_mp_set.obj \
+	$(TMP_DIR)\bn_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_sub.obj \
+	$(TMP_DIR)\bn_mp_sub_d.obj \
+	$(TMP_DIR)\bn_mp_toom_mul.obj \
+	$(TMP_DIR)\bn_mp_toom_sqr.obj \
+	$(TMP_DIR)\bn_mp_toradix_n.obj \
+	$(TMP_DIR)\bn_mp_zero.obj \
+	$(TMP_DIR)\bn_s_mp_add.obj \
+	$(TMP_DIR)\bn_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_s_mp_sub.obj \
 !if !$(STATIC_BUILD)
 	$(TMP_DIR)\tcl.res
 !endif
@@ -342,6 +394,7 @@ TCLSTUBOBJS = $(TMP_DIR)\tclStubLib.obj
 COMPATDIR	= $(ROOT)\compat
 DOCDIR		= $(ROOT)\doc
 GENERICDIR	= $(ROOT)\generic
+TOMMATHDIR	= $(ROOT)\libtommath
 TOOLSDIR	= $(ROOT)\tools
 WINDIR		= $(ROOT)\win
 
@@ -396,9 +449,9 @@ crt = -MT
 !endif
 !endif
 
-TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)"
+TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"
 BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) \
-			-DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\"
+			-DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH
 CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE
 TCL_CFLAGS	= $(BASE_CFLAGS) $(OPTDEFINES)
 STUB_CFLAGS     = $(cflags) $(cdebug) $(OPTDEFINES)
@@ -840,6 +893,11 @@ $(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
 $<
 <<
 
+{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::
+    $(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
 {$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
     $(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
 $<