diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:22:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:22:06 +0000 |
| commit | 64b520639e4ad4155844b891a660c5d126bc3c86 (patch) | |
| tree | 6169b3c56f0772e458c6c0a3d7f2c05240994f31 /vcl/util | |
| parent | 74608fba84e990d8e56b28d1f6c42b627f28a371 (diff) | |
INTEGRATION: CWS gfbfcfg (1.98.30); FILE MERGED
2007/11/27 13:27:06 hdu 1.98.30.3: RESYNC: (1.98-1.100); FILE MERGED
2007/09/07 14:20:03 hdu 1.98.30.2: #i54603# use solenv's PSPLIB define
2007/09/05 09:58:35 hdu 1.98.30.1: #i54603# apply Caolan's fontconfig based glyph fallback patch
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index d525ed82ed89..f67b9d5dacbd 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.102 $ +# $Revision: 1.103 $ # -# last change: $Author: vg $ $Date: 2007-12-07 11:51:18 $ +# last change: $Author: kz $ $Date: 2007-12-12 13:22:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -157,7 +157,7 @@ LIB1FILES= $(SLB)$/app.lib \ .IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua" LIB1FILES+=$(SLB)$/salplug.lib SHL1STDLIBS+=\ - -lpsp$(VERSION)$(DLLPOSTFIX) + $(PSPLIB) .ELSE LIB1FILES+= \ $(SLB)$/salwin.lib \ @@ -192,7 +192,7 @@ SHL1STDLIBS+= \ .IF "$(USE_BUILTIN_RASTERIZER)"!="" LIB1FILES += $(SLB)$/glyphs.lib - SHL1STDLIBS+= $(FREETYPELIB) + SHL1STDLIBS+= $(FREETYPELIB) $(PSPLIB) .ENDIF # USE_BUILTIN_RASTERIZER SHL1LIBS= $(LIB1TARGET) @@ -269,7 +269,7 @@ SHL2DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN) # libs for generic plugin SHL2STDLIBS=\ $(VCLLIB)\ - -lpsp$(VERSION)$(DLLPOSTFIX)\ + $(PSPLIB)\ $(SOTLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ @@ -365,8 +365,8 @@ SHL4NOCHECK=TRUE SHL4STDLIBS+=-l$(SHL2TARGET) SHL4STDLIBS+=\ - $(VCLLIB)\ - -lpsp$(VERSION)$(DLLPOSTFIX)\ + $(VCLLIB) \ + $(PSPLIB) \ $(SOTLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ @@ -395,7 +395,7 @@ SHL5STDLIBS=$(KDE_LIBS) SHL5STDLIBS+=-l$(SHL2TARGET) SHL5STDLIBS+=\ $(VCLLIB) \ - -lpsp$(VERSION)$(DLLPOSTFIX)\ + $(PSPLIB) \ $(TOOLSLIB) \ $(VOSLIB) \ $(SALLIB) |