diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-11-17 10:46:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-11-17 10:46:09 (GMT) |
| commit | 496915885499e820d84996442ed4daa2f710e869 (patch) | |
| tree | 5a0faaf5539a37594847b969f0e5b80d804d35a8 /win | |
| parent | 1ef30671357f51b2b430e8f22629608efda6e082 (diff) | |
| parent | b6b17310a1f35bca5640c6b6860d74d1f558ee19 (diff) | |
| download | tcl-496915885499e820d84996442ed4daa2f710e869.zip tcl-496915885499e820d84996442ed4daa2f710e869.tar.gz tcl-496915885499e820d84996442ed4daa2f710e869.tar.bz2 | |
Merge trunk. Re-generate tclTomMath.h. Use faster exponentiation-function from libtommath 1.0 (in tclExecute.c).
FossilOrigin-Name: 1e2d716ec7638c034b23c1789210335dba37d7b5
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 83f9b67..e967ef3 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -197,7 +197,7 @@ RM = rm -f COPY = cp CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \ --I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \ +-I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" \ -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} @@ -205,7 +205,7 @@ CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ --I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \ +-I"${GENERIC_DIR_NATIVE}" -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \ -I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \ ${COMPILE_DEBUG_FLAGS} diff --git a/win/makefile.vc b/win/makefile.vc index 8526203..c10b196 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -504,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)
|