diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-20 21:43:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-20 21:43:37 (GMT) |
| commit | 3d73169d61cf9b795515d4c8a325ec0fa886bea8 (patch) | |
| tree | fa39ad45219248b0908067599ace646350830668 | |
| parent | 21c4569612e301d04f43b1360e70eb88789ee1ca (diff) | |
| parent | d925e8a8f0a6b7903e5183742422097f0789d210 (diff) | |
| download | tcl-3d73169d61cf9b795515d4c8a325ec0fa886bea8.zip tcl-3d73169d61cf9b795515d4c8a325ec0fa886bea8.tar.gz tcl-3d73169d61cf9b795515d4c8a325ec0fa886bea8.tar.bz2 | |
New import libraries for zlib 1.2.7, usable for all win32/win64 compilers
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | compat/zlib/win32/zdll.lib | bin | 13438 -> 15256 bytes | |||
| -rw-r--r-- | compat/zlib/win64/zdll.lib | bin | 45650 -> 14896 bytes | |||
| -rwxr-xr-x | win/configure | 9 | ||||
| -rw-r--r-- | win/configure.in | 4 |
5 files changed, 5 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2012-09-20 Jan Nijtmans <nijtmans@users.sf.net> + * win/configure.in: New import libraries for zlib 1.2.7, + * win/configure: usable for all win32/win64 compilers + * compat/zlib/win32/zdll.lib + * compat/zlib/win64/zdll.lib + * win/tclWinDde.c: [Frq 3527238]: Full unicode support for dde. Dde version is now 1.4.0b2. ***POTENTIAL INCOMPATIBILITY*** diff --git a/compat/zlib/win32/zdll.lib b/compat/zlib/win32/zdll.lib Binary files differindex 4e53491..669b186 100644 --- a/compat/zlib/win32/zdll.lib +++ b/compat/zlib/win32/zdll.lib diff --git a/compat/zlib/win64/zdll.lib b/compat/zlib/win64/zdll.lib Binary files differindex 084dbff..d7dfb09 100644 --- a/compat/zlib/win64/zdll.lib +++ b/compat/zlib/win64/zdll.lib diff --git a/win/configure b/win/configure index 521fc51..0258898 100755 --- a/win/configure +++ b/win/configure @@ -4344,12 +4344,6 @@ esac # 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 enableval="$enable_shared" @@ -4361,9 +4355,6 @@ else fi - -fi - if test "$tcl_ok" = "yes"; then ZLIB_DLL_FILE=\${ZLIB_DLL_FILE} diff --git a/win/configure.in b/win/configure.in index 9145ff3..0426bb1 100644 --- a/win/configure.in +++ b/win/configure.in @@ -120,16 +120,12 @@ esac # 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"], [ |