diff options
| author | Herbert Duerr <hdu@openoffice.org> | 2001-02-15 15:52:29 +0000 |
|---|---|---|
| committer | Herbert Duerr <hdu@openoffice.org> | 2001-02-15 15:52:29 +0000 |
| commit | c46be87633e2ad9014a8429966df2465a99ab023 (patch) | |
| tree | 28b0a01f9946ee6602f21b91afd59703556ac2b9 /vcl/util | |
| parent | 464b643aacd3417284c3180e0b214caac27d97df (diff) | |
add serverfont defines
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index a03785e67ee0..291bf03c4eae 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: obr $ $Date: 2001-02-14 08:32:01 $ +# last change: $Author: hdu $ $Date: 2001-02-15 16:52:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -190,10 +190,7 @@ LIB1FILES+= $(SLB)$/ex.lib .ENDIF .IF "$(remote)" != "" -LIB1FILES+= \ - $(SLB)$/remote.lib \ - $(SLB)$/glyphs.lib - + LIB1FILES+= $(SLB)$/remote.lib .IF "$(COM)"=="GCC" LIB1OBJFILES=$(SLO)$/salmain.obj .ENDIF @@ -205,11 +202,19 @@ LIB1FILES+= \ .ENDIF .IF "$(GUI)" == "UNX" -.IF "$(PSPRINT)"!="" -SHL1STDLIBS=-lpsp$(VERSION)$(DLLPOSTFIX) +.IF "$(PSPRINT)" != "" + SHL1STDLIBS=-lpsp$(VERSION)$(DLLPOSTFIX) +.ENDIF +.IF "$(USE_XRENDER)" != "" + SHL1STDLIBS+=-lXrender .ENDIF .ENDIF +.IF "$(USE_BUILTIN_RASTERIZER)"!="" + LIB1FILES += $(SLB)$/glyphs.lib + SHL1STDLIBS+= $(FREETYPELIB) +.ENDIF + SHL1TARGET= vcl$(VERSION)$(DLLPOSTFIX) SHL1IMPLIB= ivcl SHL1STDLIBS+=\ @@ -224,9 +229,7 @@ SHL1STDLIBS+=\ $(COMPHELPERLIB) .IF "$(remote)" != "" -SHL1STDLIBS+=\ - $(UNOLIB) \ - $(FREETYPELIB) +SHL1STDLIBS+= $(UNOLIB) .ENDIF .IF "$(GUI)"!="MAC" |