diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:39:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:39:06 +0000 |
| commit | 509c4da8c76a3050d3acab8987f95c07e588d687 (patch) | |
| tree | 8e59f5474925d456f028d2eda28c5bf235b6c654 /sj2 | |
| parent | 2f0c26fb7788a19cc09f0cc87f54e57d466d05ba (diff) | |
INTEGRATION: CWS ause044 (1.10.12); FILE MERGED
2005/11/29 11:48:28 hjs 1.10.12.1: #i51169# added svt.lib for windows
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/util/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sj2/util/makefile.mk b/sj2/util/makefile.mk index 0bf419a5e2bf..881e13dbae81 100644 --- a/sj2/util/makefile.mk +++ b/sj2/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2005-09-07 20:19:53 $ +# last change: $Author: rt $ $Date: 2005-12-14 15:39:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,6 +61,11 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(SALLIB) +.IF "$(GUI)"=="WNT" && "$(COMID)"=="MSC" +SHL1STDLIBS+= \ + $(SVTOOLLIB) +.ENDIF # "$(GUI)"=="WNT" + .IF "$(SOLAR_JAVA)"!="" SHL1STDLIBS+=$(JVMACCESSLIB) .ENDIF @@ -92,11 +97,5 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo exception::exception>>$@ .IF "$(COM)"=="MSC" @echo __CT>>$@ + @echo _C@>>$@ .ENDIF -.IF "$(COM)"=="ICC" - @echo __lower_bound>>$@ - @echo __stl_prime>>$@ - @echo __alloc>>$@ - @echo __malloc>>$@ -.ENDIF - |