summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-11-11 00:54:09 (GMT)
committerhobbs <hobbs>2003-11-11 00:54:09 (GMT)
commit9f264415fc12875ecd14a27dae3983d8ce7b01ba (patch)
treecebed9afa16ca37fe7a8726b9a94c9c1d21b0de2
parent48625687fac25489863ddf5b6983ea8fdd2c3d94 (diff)
downloadtk-9f264415fc12875ecd14a27dae3983d8ce7b01ba.zip
tk-9f264415fc12875ecd14a27dae3983d8ce7b01ba.tar.gz
tk-9f264415fc12875ecd14a27dae3983d8ce7b01ba.tar.bz2
* win/configure:
* win/tcl.m4: add necessary ole libs to VC LIBS_GUI line.
-rw-r--r--ChangeLog3
-rwxr-xr-xwin/configure2
-rw-r--r--win/tcl.m42
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e999a19..4262f06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-11-10 Jeff Hobbs <jeffh@ActiveState.com>
+ * win/configure:
+ * win/tcl.m4: add necessary ole libs to VC LIBS_GUI line.
+
* win/tkWinDraw.c (XFillRectangles): correctly handle the
XGCValues.function parameter when filling rectangles.
[Bug #820278] [Patch #820282]
diff --git a/win/configure b/win/configure
index 517c6b9..fa887bb 100755
--- a/win/configure
+++ b/win/configure
@@ -2778,7 +2778,7 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;}
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
LIBS="user32.lib advapi32.lib"
- LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib"
+ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
RC_OUT=-fo
RC_TYPE=-r
RC_INCLUDE=-i
diff --git a/win/tcl.m4 b/win/tcl.m4
index 8f891ba..fd330be 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -607,7 +607,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
LIBS="user32.lib advapi32.lib"
- LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib"
+ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
RC_OUT=-fo
RC_TYPE=-r
RC_INCLUDE=-i