Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add 64-bit build of zlib1.dll, and use it for the dynamic mingw-w64 build |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
17f050e907abc65da2c6d1f700b9b40f |
User & Date: | jan.nijtmans 2012-08-13 13:58:25 |
Context
2012-08-13
| ||
14:02 | .... but be less verbose check-in: 7762aa5871 user: jan.nijtmans tags: trunk | |
13:58 | Add 64-bit build of zlib1.dll, and use it for the dynamic mingw-w64 build check-in: 17f050e907 user: jan.nijtmans tags: trunk | |
04:42 | minor fix check-in: 3ef4f0c6d7 user: jan.nijtmans tags: trunk | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2012-08-09 Reinhard Max <[email protected]> * tests/http.test: Fix http-3.29 for machines without IPv6 support. 2010-08-08 Stuart Cassoff <[email protected]> * unix/tclUnixCompat.c: Change one '#ifdef' to '#if defined()' for | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | 2012-08-13 Jan Nijtmans <[email protected]> * compat/zlib/win64/zlib1.dll: Add 64-bit build of zlib1.dll, and use it * compat/zlib/win64/zdll.lib: for the dynamic mingw-w64 build. * win/Makefile.in * win/configure.in * win/configure 2012-08-09 Reinhard Max <[email protected]> * tests/http.test: Fix http-3.29 for machines without IPv6 support. 2010-08-08 Stuart Cassoff <[email protected]> * unix/tclUnixCompat.c: Change one '#ifdef' to '#if defined()' for |
︙ | ︙ |
Added compat/zlib/win64/zdll.lib.
cannot compute difference between binary files
Added compat/zlib/win64/zlib1.dll.
cannot compute difference between binary files
Changes to win/Makefile.in.
︙ | ︙ | |||
452 453 454 455 456 457 458 | @MAKE_DLL@ ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE} @$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE} @MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) # use pre-built zlib1.dll | | > > > | > | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 | @MAKE_DLL@ ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE} @$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE} @MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) # use pre-built zlib1.dll ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE} if test "@ZLIB_LIBS@set" == "${ZLIB_DIR}/win64/zdll.libset" ; then \ $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ else \ $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ fi; # Add the object extension to the implicit rules. By default .obj is not # automatically added. .SUFFIXES: .${OBJEXT} .SUFFIXES: .$(RES) .SUFFIXES: .rc |
︙ | ︙ |
Changes to win/configure.
︙ | ︙ | |||
4340 4341 4342 4343 4344 4345 4346 | esac #------------------------------------------------------------------------ # Add stuff for zlib; note that this is mostly done in the makefile now # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ | | | 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 | esac #------------------------------------------------------------------------ # Add stuff for zlib; note that this is mostly done in the makefile now # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ if test "$do64bit" = "yes" && test "$GCC" != "yes"; then tcl_ok=no else if test "${enable_shared+set}" = "set"; then |
︙ | ︙ | |||
4364 4365 4366 4367 4368 4369 4370 | fi if test "$tcl_ok" = "yes"; then ZLIB_DLL_FILE=\${ZLIB_DLL_FILE} | > > > > > > > | > > > | 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 | fi if test "$tcl_ok" = "yes"; then ZLIB_DLL_FILE=\${ZLIB_DLL_FILE} if test "$do64bit" = "yes"; then ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib else ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib fi else ZLIB_OBJS=\${ZLIB_OBJS} cat >>confdefs.h <<_ACEOF |
︙ | ︙ |
Changes to win/configure.in.
︙ | ︙ | |||
116 117 118 119 120 121 122 | esac #------------------------------------------------------------------------ # Add stuff for zlib; note that this is mostly done in the makefile now # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ | | > > > | > | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | esac #------------------------------------------------------------------------ # Add stuff for zlib; note that this is mostly done in the makefile now # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ AS_IF([test "$do64bit" = "yes" && test "$GCC" != "yes"], [ tcl_ok=no ], [ AS_IF([test "${enable_shared+set}" = "set"], [ enableval="$enable_shared" tcl_ok=$enableval ], [ tcl_ok=yes ]) ]) AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) AS_IF([test "$do64bit" = "yes"], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) ], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) ]) ], [ AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) AC_DEFINE_UNQUOTED(NO_VIZ, 1) ]) AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?]) AC_CHECK_TYPE([intptr_t], [ |
︙ | ︙ |