diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-22 10:00:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-22 10:00:56 +0000 |
| commit | a7a09d627f34cfdd52bbd901662a07b4600d331b (patch) | |
| tree | bc4363c5cc02dc8a0f51d2c6902629f8fd3c4e1a /canvas | |
| parent | b25d9b203ca4c9cc2aaaa7e791192a8a4eab3293 (diff) | |
INTEGRATION: CWS cairofixes01 (1.2.2); FILE MERGED
2006/03/03 11:14:13 thb 1.2.2.1: #i62712# Added Xrender to link line (seems to be missing for some systems)
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk index 150bbb16a3aa..9f36a7f7cfbe 100644 --- a/canvas/source/cairo/makefile.mk +++ b/canvas/source/cairo/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: kz $ $Date: 2006-02-28 10:40:25 $ +# last change: $Author: obo $ $Date: 2006-03-22 11:00:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -110,9 +110,9 @@ SHL1TARGET=$(TARGET).uno SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB) .IF "$(SYSTEM_CAIRO)" == "YES" -SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 +SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 -lXrender .ELSE -SHL1STDLIBS+= -lcairo -lX11 +SHL1STDLIBS+= -lcairo -lX11 -lXrender .ENDIF SHL1IMPLIB=i$(TARGET) |