From d925e8a8f0a6b7903e5183742422097f0789d210 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Sep 2012 21:58:56 +0000
Subject: Experiment: MSVC build now links with 64-bit zlib1.dll
---
compat/zlib/win32/zdll.lib | Bin 13438 -> 15256 bytes
compat/zlib/win64/zdll.lib | Bin 45650 -> 14896 bytes
win/configure | 9 ---------
win/configure.in | 4 ----
4 files changed, 13 deletions(-)
diff --git a/compat/zlib/win32/zdll.lib b/compat/zlib/win32/zdll.lib
index 4e53491..669b186 100644
Binary files a/compat/zlib/win32/zdll.lib and b/compat/zlib/win32/zdll.lib differ
diff --git a/compat/zlib/win64/zdll.lib b/compat/zlib/win64/zdll.lib
index 084dbff..d7dfb09 100644
Binary files a/compat/zlib/win64/zdll.lib and b/compat/zlib/win64/zdll.lib 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"], [
--
cgit v0.12