diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-13 13:58:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-13 13:58:25 (GMT) |
| commit | 124e26e763eb211d3514574042b714fc92dcbf14 (patch) | |
| tree | 66cdac3b88476759574508f0dec990906ecc68e7 /win/Makefile.in | |
| parent | 063747525bde41ea8de3c5c01170148084fd801d (diff) | |
| download | tcl-124e26e763eb211d3514574042b714fc92dcbf14.zip tcl-124e26e763eb211d3514574042b714fc92dcbf14.tar.gz tcl-124e26e763eb211d3514574042b714fc92dcbf14.tar.bz2 | |
Add 64-bit build of zlib1.dll, and use it for the dynamic mingw-w64 build
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 84dcaf7..fbc9274 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -456,8 +456,12 @@ ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE} @MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) # use pre-built zlib1.dll -${ZLIB_DLL_FILE}: $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} - @$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE} +${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. |