diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-20 14:14:00 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-20 14:14:00 (GMT) |
| commit | 6d47648771e23b3c33038a86e89fcaa55af16dba (patch) | |
| tree | 7a0312e58d298d09068fef5d9311e409cd47f771 /win/configure | |
| parent | 1e5b4c061fd012e8814dd840bb9bd3f35d742c05 (diff) | |
| parent | 9c36a658376bf2e20c50a154f69ec15762a49391 (diff) | |
| download | tcl-6d47648771e23b3c33038a86e89fcaa55af16dba.zip tcl-6d47648771e23b3c33038a86e89fcaa55af16dba.tar.gz tcl-6d47648771e23b3c33038a86e89fcaa55af16dba.tar.bz2 | |
merge trunk
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 757a6e8..521fc51 100755 --- a/win/configure +++ b/win/configure @@ -4344,7 +4344,7 @@ esac # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ -if test "$do64bit" = "yes"; then +if test "$do64bit" = "yes" && test "$GCC" != "yes"; then tcl_ok=no @@ -4368,7 +4368,17 @@ if test "$tcl_ok" = "yes"; then ZLIB_DLL_FILE=\${ZLIB_DLL_FILE} - ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib + if test "$do64bit" = "yes"; then + + ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib + + +else + + ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib + + +fi else |