Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Proposed workaround for [b5ced5865b]: newer MinGW compilers can link directory to the zlib dll, hopefully older MinGW's which cannot do that are obsolete now. For now, leave 64-bit as-is. |
|---|---|
| Timelines: | family | ancestors | bug-b5ced5865b |
| Files: | files | file ages | folders |
| SHA1: |
f4b66e37c780769fd29a2e7449ffa20c |
| User & Date: | jan.nijtmans 2014-11-04 16:05:02.100 |
Context
|
2014-11-04
| ||
| 16:05 | Proposed workaround for [b5ced5865b]: newer MinGW compilers can link directory to the zlib dll, hope... Closed-Leaf check-in: f4b66e37c7 user: jan.nijtmans tags: bug-b5ced5865b | |
|
2014-11-03
| ||
| 12:54 | Add test-case for previous commit, which shows that when trying to open a filename with invalid char... check-in: 9971779e88 user: jan.nijtmans tags: trunk | |
Changes
Changes to win/Makefile.in.
| ︙ | ︙ | |||
455 456 457 458 459 460 461 |
${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
@$(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}
| | > | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 |
${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
@$(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" != "-L. -lzset" -a "@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}; \
$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} libz.dll.a; \
fi;
# Add the object extension to the implicit rules. By default .obj is not
# automatically added.
.SUFFIXES: .${OBJEXT}
.SUFFIXES: .$(RES)
|
| ︙ | ︙ |
Changes to win/configure.
| ︙ | ︙ | |||
4373 4374 4375 4376 4377 4378 4379 | fi else | > > > > > > > | > > > | 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 |
fi
else
if test "$GCC" == "yes"; then
ZLIB_LIBS="-L. -lz"
else
ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib
fi
fi
else
|
| ︙ | ︙ |
Changes to win/configure.in.
| ︙ | ︙ | |||
131 132 133 134 135 136 137 |
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])
])
], [
| > > > | > | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
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])
])
], [
AS_IF([test "$GCC" == "yes"],[
AC_SUBST(ZLIB_LIBS,["-L. -lz"])
], [
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?])
AC_CHECK_TYPE([intptr_t], [
|
| ︙ | ︙ |