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 | c5e721806345e37d192fc329af24785b5490c08a (patch) | |
| tree | 66cdac3b88476759574508f0dec990906ecc68e7 /win/configure | |
| parent | 6c8d57ffe3737a001786e0838daaf1a6e9f246c1 (diff) | |
| download | tcl-c5e721806345e37d192fc329af24785b5490c08a.zip tcl-c5e721806345e37d192fc329af24785b5490c08a.tar.gz tcl-c5e721806345e37d192fc329af24785b5490c08a.tar.bz2 | |
Add 64-bit build of zlib1.dll, and use it for the dynamic mingw-w64 build
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 f5a23fe..5cf1513 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 |