diff options
| author | davygrvy <davygrvy> | 2004-01-15 21:46:22 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2004-01-15 21:46:22 (GMT) |
| commit | 02bc33334a9bfda0eff8061d2a5293cb62506547 (patch) | |
| tree | e638f5cd3b23a83e0619b59902ea1745a45cf6e1 | |
| parent | 69b7d76e12e7726910f8b2121789c38d714fe565 (diff) | |
| download | tk-02bc33334a9bfda0eff8061d2a5293cb62506547.zip tk-02bc33334a9bfda0eff8061d2a5293cb62506547.tar.gz tk-02bc33334a9bfda0eff8061d2a5293cb62506547.tar.bz2 | |
* win/tkWinSendCom.c: Placed the requirement for the special COM
libraries into the object file itself with #paragma comment (lib, ...)
when built with VC++. This will simplify linking for users of the
static library. uuid.lib is required for VC5.2, but is implicit
with VC6.
* win/makefile.vc: Removed 'ole32.lib oleaut32.lib uuid.lib' from
$(baselibs).
| -rw-r--r-- | win/makefile.vc | 8 | ||||
| -rw-r--r-- | win/tkWinSendCom.c | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 27bad09..3ea888d 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2003 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.79 2004/01/13 13:43:36 vincentdarley Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.80 2004/01/15 21:46:22 davygrvy Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -433,7 +433,7 @@ dlllflags = $(lflags) -dll conlflags = $(lflags) -subsystem:console guilflags = $(lflags) -subsystem:windows -baselibs = kernel32.lib user32.lib ole32.lib oleaut32.lib uuid.lib +baselibs = kernel32.lib user32.lib guilibs = $(baselibs) gdi32.lib @@ -799,10 +799,10 @@ $< #--------------------------------------------------------------------- clean: - -@$(RMDIR) $(TMP_DIR) + -$(RMDIR) $(TMP_DIR) hose: clean - -@$(RMDIR) $(OUT_DIR) + -$(RMDIR) $(OUT_DIR) .SUFFIXES: diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c index b5e0686..9ad1f15 100644 --- a/win/tkWinSendCom.c +++ b/win/tkWinSendCom.c @@ -17,11 +17,17 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSendCom.c,v 1.3 2003/11/20 19:36:58 vincentdarley Exp $ + * RCS: @(#) $Id: tkWinSendCom.c,v 1.4 2004/01/15 21:46:22 davygrvy Exp $ */ #include "tkWinSendCom.h" +#ifdef _MSC_VER +# pragma comment (lib, "ole32.lib") +# pragma comment (lib, "oleaut32.lib") +# pragma comment (lib, "uuid.lib") +#endif + /* * ---------------------------------------------------------------------- * Non-public prototypes. |