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.in | |
| 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.in')
| -rw-r--r-- | win/configure.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/configure.in b/win/configure.in index d17f815..de56bf7 100644 --- a/win/configure.in +++ b/win/configure.in @@ -120,7 +120,7 @@ esac # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ -AS_IF([test "$do64bit" = "yes"], [ +AS_IF([test "$do64bit" = "yes" && test "$GCC" != "yes"], [ tcl_ok=no ], [ AS_IF([test "${enable_shared+set}" = "set"], [ @@ -132,7 +132,11 @@ AS_IF([test "${enable_shared+set}" = "set"], [ ]) AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) - AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) + AS_IF([test "$do64bit" = "yes"], [ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) + ], [ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) + ]) ], [ AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) AC_DEFINE_UNQUOTED(NO_VIZ, 1) |