summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorthb <thb@openoffice.org>2010-01-18 20:58:27 +0100
committerthb <thb@openoffice.org>2010-01-18 20:58:27 +0100
commit80e02df062b8e91202d3cd4c420edbe33efcfc7a (patch)
tree6e14abe67076218db9ba4314be35f0b983890fcb /canvas
parentd0427d82613f5ce881b86098fce3c8a1b1bbdfdc (diff)
#i105834# Fix cairo link flags
* applied patch, kudos to Petr for the fix
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
index 27a1aeb6dcd7..95ad047ea434 100644
--- a/canvas/source/cairo/makefile.mk
+++ b/canvas/source/cairo/makefile.mk
@@ -91,7 +91,7 @@ SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELP
.IF "$(SYSTEM_CAIRO)" == "YES"
SHL1STDLIBS+= $(CAIRO_LIBS)
.ELSE
-SHL1STDLIBS+= -lcairo
+SHL1STDLIBS+= -lcairo -lpixman-1
.ENDIF
.IF "$(GUIBASE)"=="aqua"
@@ -102,7 +102,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
# Xlib
SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj
-SHL1STDLIBS+= -lfontconfig -lX11 -lXrender -lpixman-1 $(FREETYPE_LIBS)
+SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS)
CFLAGS+=$(FREETYPE_CFLAGS)
.ENDIF # "$(GUIBASE)"=="aqua"