summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-09-07 21:58:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-09-07 21:58:56 (GMT)
commitd925e8a8f0a6b7903e5183742422097f0789d210 (patch)
tree76a69e7c52120ff20eef36477d4b42050fe4f07e
parentaafb8f260959dba7316e70f8dfd6afcd1a9248d0 (diff)
downloadtcl-d925e8a8f0a6b7903e5183742422097f0789d210.zip
tcl-d925e8a8f0a6b7903e5183742422097f0789d210.tar.gz
tcl-d925e8a8f0a6b7903e5183742422097f0789d210.tar.bz2
Experiment: MSVC build now links with 64-bit zlib1.dllmsvc_with_64bit_zlib1_dll
-rw-r--r--compat/zlib/win32/zdll.libbin13438 -> 15256 bytes
-rw-r--r--compat/zlib/win64/zdll.libbin45650 -> 14896 bytes
-rwxr-xr-xwin/configure9
-rw-r--r--win/configure.in4
4 files changed, 0 insertions, 13 deletions
diff --git a/compat/zlib/win32/zdll.lib b/compat/zlib/win32/zdll.lib
index 4e53491..669b186 100644
--- a/compat/zlib/win32/zdll.lib
+++ b/compat/zlib/win32/zdll.lib
Binary files differ
diff --git a/compat/zlib/win64/zdll.lib b/compat/zlib/win64/zdll.lib
index 084dbff..d7dfb09 100644
--- a/compat/zlib/win64/zdll.lib
+++ b/compat/zlib/win64/zdll.lib
Binary files differ
diff --git a/win/configure b/win/configure
index 5cf1513..3e08d5d 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 de56bf7..cd6088e 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"], [