diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:52:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:52:33 +0000 |
| commit | 965124b310756436c68e2a2350a773091041e937 (patch) | |
| tree | 1e0ad52d7777cfd84a1af442add7ae999c8965e3 /sal/systools | |
| parent | 4a31ed4ba2a9a4aabffd6ee6f30ad0bf49644c4c (diff) | |
INTEGRATION: CWS sb71 (1.13.16); FILE MERGED
2007/08/23 17:55:29 sb 1.13.16.2: RESYNC: (1.13-1.14); FILE MERGED
2007/07/25 12:02:12 sb 1.13.16.1: #i77184# Drop MSVCRTLIB again and use already existing LIBCMT instead (which for wntmsci10 and wntmsci11 at least correctly differentiates between using msvcrt.lib and msvcrtd.lib; this probably needs to be added for wntgcci6, too).
Diffstat (limited to 'sal/systools')
| -rw-r--r-- | sal/systools/win32/uwinapi/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk index add3ee335cac..d129a5b95421 100644 --- a/sal/systools/win32/uwinapi/makefile.mk +++ b/sal/systools/win32/uwinapi/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: ihi $ $Date: 2007-08-20 13:36:11 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:52:33 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -153,7 +153,7 @@ SHL1STDLIBS+=\ $(USER32LIB)\ $(ADVAPI32LIB)\ $(VERSIONLIB)\ - $(MSVCRTLIB)\ + $(LIBCMT)\ $(SHLWAPILIB) |