summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-12-05 18:41:01 (GMT)
committerhobbs <hobbs>2007-12-05 18:41:01 (GMT)
commit43b261709d1778d45d80eb0bcce2dad20584f8b5 (patch)
tree07e8bfb454ae1705ab2b7bf5885059006b3e89c2
parent44dfaf44b176658515d99b3cb131655d5e5cf3fe (diff)
downloadtk-43b261709d1778d45d80eb0bcce2dad20584f8b5.zip
tk-43b261709d1778d45d80eb0bcce2dad20584f8b5.tar.gz
tk-43b261709d1778d45d80eb0bcce2dad20584f8b5.tar.bz2
* win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32
-loleaut32 but not msvc for Tk's [send]. [Bug 1844749]
-rw-r--r--ChangeLog5
-rwxr-xr-xwin/configure3
-rw-r--r--win/tcl.m43
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1291505..0c419ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32
+ -loleaut32 but not msvc for Tk's [send]. [Bug 1844749]
+
2007-12-04 Joe English <jenglish@users.sourceforge.net>
* doc/ttk_style.n: Remove nonsense about "this manpage has
diff --git a/win/configure b/win/configure
index 30269df..5e75ca2 100755
--- a/win/configure
+++ b/win/configure
@@ -2732,7 +2732,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=
diff --git a/win/tcl.m4 b/win/tcl.m4
index 63b9053..833680f 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -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=