diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 11:16:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 11:16:24 +0000 |
| commit | 990f07cd395dcacf30ff461652a3430dd89f1531 (patch) | |
| tree | ad326701805f218ce002b7ee5de0fbc029594b7d /udm | |
| parent | 9b32f0a63b1d171c77a6b346577130e6e587d063 (diff) | |
INTEGRATION: CWS ooo20040225 (1.1.1.1.74); FILE MERGED
2004/02/17 10:02:15 dsherwin 1.1.1.1.74.1: #i23204# Remove msvcirt.lib from the linking line for .NET 2003 compiler
Diffstat (limited to 'udm')
| -rw-r--r-- | udm/source/unittest/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/udm/source/unittest/makefile.mk b/udm/source/unittest/makefile.mk index e51e154a4630..f3b5862c9f9d 100644 --- a/udm/source/unittest/makefile.mk +++ b/udm/source/unittest/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: np $ $Date: 2002-03-08 14:32:38 $ +# last change: $Author: hr $ $Date: 2004-03-09 12:16:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -91,7 +91,11 @@ APP1TARGET= $(TARGET) APP1STACK= 1000000 APP1OBJS= $(OBJ)$/test.obj +.IF "$(COMEX)"=="10" +APP1STDLIBS= $(STATIC_LIBS) cosv.lib +.ELSE APP1STDLIBS= $(STATIC_LIBS) msvcirt.lib cosv.lib +.ENDIF APP1LIBS= $(LB)$/$(TARGET).lib |