diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-12-05 20:24:28 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-12-05 20:24:28 (GMT) |
| commit | 1cd55299205543b1ce7124907de87ba055cd688b (patch) | |
| tree | 34816215f2a6c66f1c5a0d0ef2ada387727a8925 /win | |
| parent | f871c9d6cd3f4e13bb58cd768fba190b3ce00e0e (diff) | |
| download | tcl-1cd55299205543b1ce7124907de87ba055cd688b.zip tcl-1cd55299205543b1ce7124907de87ba055cd688b.tar.gz tcl-1cd55299205543b1ce7124907de87ba055cd688b.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 3 | ||||
| -rw-r--r-- | win/tcl.m4 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/win/configure b/win/configure index ef3e311..5dbcca8 100755 --- a/win/configure +++ b/win/configure @@ -3378,7 +3378,8 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;} SHLIB_LD="" SHLIB_LD_LIBS="" LIBS="-lws2_32" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid" + # 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' RC_OUT=-o RC_TYPE= @@ -447,7 +447,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD="" SHLIB_LD_LIBS="" LIBS="-lws2_32" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid" + # 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' RC_OUT=-o RC_TYPE= |