diff options
| author | nijtmans <nijtmans> | 2008-12-11 22:30:31 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-12-11 22:30:31 (GMT) |
| commit | 85aba5fb4879a9d1e77e993796d21973453a20cd (patch) | |
| tree | 01bb50195b9e551edd9c706c9109db1de681f175 /win | |
| parent | 6cb99f7bf8a960b9c8db1d06c4509fea270989b1 (diff) | |
| download | tcl-85aba5fb4879a9d1e77e993796d21973453a20cd.zip tcl-85aba5fb4879a9d1e77e993796d21973453a20cd.tar.gz tcl-85aba5fb4879a9d1e77e993796d21973453a20cd.tar.bz2 | |
Eliminate warning: different 'const' qualifiers
with msvc compiler. A few more 'const' optimizations.
fix Windows build (msvc) for TIP #234 implementation
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rwxr-xr-x | win/configure | 4 | ||||
| -rw-r--r-- | win/tcl.m4 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 16d7474..ebe7f5c 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.138 2008/12/11 14:32:34 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.139 2008/12/11 22:30:31 nijtmans Exp $ VERSION = @TCL_VERSION@ @@ -177,7 +177,7 @@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(LIBS) SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ -LIBS = @LIBS@ -lz +LIBS = @LIBS@ RMDIR = rm -rf MKDIR = mkdir -p diff --git a/win/configure b/win/configure index 54c8274..40a48f8 100755 --- a/win/configure +++ b/win/configure @@ -3798,7 +3798,7 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;} fi SHLIB_LD="" SHLIB_LD_LIBS="" - LIBS="-lws2_32" + LIBS="-lws2_32 -lz" # mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32" STLIB_LD='${AR} cr' @@ -3976,7 +3976,7 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 fi fi - LIBS="user32.lib advapi32.lib ws2_32.lib" + LIBS="user32.lib advapi32.lib ws2_32.lib zdll.lib" if test "$do64bit" != "no" ; then # The space-based-path will work for the Makefile, but will # not work if AC_TRY_COMPILE is called. TEA has the @@ -446,7 +446,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ fi SHLIB_LD="" SHLIB_LD_LIBS="" - LIBS="-lws2_32" + LIBS="-lws2_32 -lz" # mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32" STLIB_LD='${AR} cr' @@ -614,7 +614,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ fi fi - LIBS="user32.lib advapi32.lib ws2_32.lib" + LIBS="user32.lib advapi32.lib ws2_32.lib zdll.lib" if test "$do64bit" != "no" ; then # The space-based-path will work for the Makefile, but will # not work if AC_TRY_COMPILE is called. TEA has the |