From 4d454b8c5a793dbd41f1a6376f432e18debdedd3 Mon Sep 17 00:00:00 2001 From: mdejong Date: Mon, 13 Jan 2003 07:22:56 +0000 Subject: * win/configure: Regen. * win/tcl.m4 (SC_CONFIG_CFLAGS): Pull in addition of shell32.lib to LIBS_GUI that was added to the Tk tcl.m4 but never made it back into the Tcl version. --- ChangeLog | 8 ++++++++ win/configure | 4 ++-- win/tcl.m4 | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 639730e..1e27de1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-01-12 Mo DeJong + * win/configure: Regen. + * win/tcl.m4 (SC_CONFIG_CFLAGS): Pull in + addition of shell32.lib to LIBS_GUI that + was added to the Tk tcl.m4 but never made + it back into the Tcl version. + +2003-01-12 Mo DeJong + * generic/tcl.h: Skip Tcl's define of CHAR, SHORT, and LONG when HAVE_WINNT_IGNORE_VOID is defined. This avoids a bunch of compiler diff --git a/win/configure b/win/configure index 68d2e1e..fe0b086 100755 --- a/win/configure +++ b/win/configure @@ -1430,7 +1430,7 @@ echo "configure:1426: checking compiler flags" >&5 SHLIB_LD="" SHLIB_LD_LIBS="" LIBS="" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32" + LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32" STLIB_LD='${AR} cr' RC_OUT=-o RC_TYPE= @@ -1594,7 +1594,7 @@ echo "configure:1426: checking compiler flags" >&5 SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" SHLIB_LD_LIBS="user32.lib advapi32.lib" LIBS="user32.lib advapi32.lib" - LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib" + LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib" RC_OUT=-fo RC_TYPE=-r RC_INCLUDE=-i diff --git a/win/tcl.m4 b/win/tcl.m4 index 66b3b7b..0c07b21 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -431,7 +431,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD="" SHLIB_LD_LIBS="" LIBS="" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32" + LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32" STLIB_LD='${AR} cr' RC_OUT=-o RC_TYPE= @@ -595,7 +595,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" SHLIB_LD_LIBS="user32.lib advapi32.lib" LIBS="user32.lib advapi32.lib" - LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib" + LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib" RC_OUT=-fo RC_TYPE=-r RC_INCLUDE=-i -- cgit v0.12