Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Workaround for mingw-w64 (AMD64-only) bug: It appears that zdll.lib (as produced by Microsoft tools) doesn't import the zlib symbols correctly, so use "libz.dll.a" produced with mingw-w64 tools in stead. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4cca2f545531ff5d8972a44973147465 |
| User & Date: | jan.nijtmans 2013-06-12 12:24:23.127 |
Context
|
2013-06-13
| ||
| 07:23 | Fix env.test when running mingw-w64 (AMD64 build) test-suite on wine64. Fix some gcc warnings which... check-in: 7233b39085 user: jan.nijtmans tags: trunk | |
|
2013-06-12
| ||
| 12:24 | Workaround for mingw-w64 (AMD64-only) bug: It appears that zdll.lib (as produced by Microsoft tools)... check-in: 4cca2f5455 user: jan.nijtmans tags: trunk | |
| 10:29 | Silence various warnings when doing a 64-bit build with MSVC: Those warnings can only _really_ be fi... check-in: 48b92a6ab6 user: jan.nijtmans tags: trunk | |
Changes
Added compat/zlib/win64/libz.dll.a.
cannot compute difference between binary files
Changes to win/Makefile.in.
| ︙ | ︙ | |||
454 455 456 457 458 459 460 |
${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}
| | | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 |
${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}/win32/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.
|
| ︙ | ︙ |
Changes to win/configure.
| ︙ | ︙ | |||
4358 4359 4360 4361 4362 4363 4364 |
if test "$tcl_ok" = "yes"; then
ZLIB_DLL_FILE=\${ZLIB_DLL_FILE}
if test "$do64bit" = "yes"; then
| > > > > > > > | > > > | 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 |
if test "$tcl_ok" = "yes"; then
ZLIB_DLL_FILE=\${ZLIB_DLL_FILE}
if test "$do64bit" = "yes"; then
if test "$GCC" == "yes"; then
ZLIB_LIBS=\${ZLIB_DIR}/win64/libz.dll.a
else
ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib
fi
else
ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib
|
| ︙ | ︙ |
Changes to win/configure.in.
| ︙ | ︙ | |||
125 126 127 128 129 130 131 |
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"], [
| > > > | > | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 |
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"], [
AS_IF([test "$GCC" == "yes"],[
AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a])
], [
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(HAVE_ZLIB, 1, [Is there an installed zlib?])
|
| ︙ | ︙ |