diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 14:12:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 14:12:14 +0000 |
| commit | 63d68d9d074e31e84b1f5d5dc1b2960cbc753ebb (patch) | |
| tree | 87fd39fb30f57f01dbe1b94932a22d8248b3b73a /sj2 | |
| parent | 350c7252d64e78a120e0da0bcfb26ca28f8d27c7 (diff) | |
INTEGRATION: CWS msvcstandard (1.11.4); FILE MERGED
2006/01/26 03:04:05 vq 1.11.4.3: #i60754# Use dmake 4.1 syntax.
2006/01/25 02:49:40 vq 1.11.4.2: #i60754# Reset to original version. Only add $(SVTOOLLIB) for MSVC.
2006/01/23 03:58:32 vq 1.11.4.1: #i60754#, #i51169# Fix MSVC Standard build problem.
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/util/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sj2/util/makefile.mk b/sj2/util/makefile.mk index 881e13dbae81..3f0ed38951b9 100644 --- a/sj2/util/makefile.mk +++ b/sj2/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: rt $ $Date: 2005-12-14 15:39:06 $ +# last change: $Author: rt $ $Date: 2006-02-09 15:12:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,10 +61,10 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(SALLIB) -.IF "$(GUI)"=="WNT" && "$(COMID)"=="MSC" +.IF "$(GUI)$(COMID)"=="WNTMSC" SHL1STDLIBS+= \ $(SVTOOLLIB) -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(GUI)$(COMID)"=="WNTMSC" .IF "$(SOLAR_JAVA)"!="" SHL1STDLIBS+=$(JVMACCESSLIB) |