diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-29 15:26:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-29 15:26:37 +0000 |
| commit | 04a59adcc7fd221ee6b7644aa1fa53fed8dd3c0e (patch) | |
| tree | 98e45c3b1a1418ca54ef4a83f6022691099078e0 /canvas/source/cairo/makefile.mk | |
| parent | 554b7023a920d8701ef9d38c6e4952ebb41d1b5f (diff) | |
| parent | c0bfd066e3d8355d35c2ea22d5a98ac7f43406da (diff) | |
ab71: merge with DEV300_m54
Diffstat (limited to 'canvas/source/cairo/makefile.mk')
| -rw-r--r-- | canvas/source/cairo/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk index 0466b1d07723..bd54254abf7e 100644 --- a/canvas/source/cairo/makefile.mk +++ b/canvas/source/cairo/makefile.mk @@ -99,12 +99,14 @@ SHL1STDLIBS+= -lcairo SLOFILES+= $(SLO)$/cairo_quartz_cairo.obj OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions CFLAGSCXX+=$(OBJCXXFLAGS) -SHL1STDLIBS+= -lpixman-1 -.ELSE +.ELSE # "$(GUIBASE)"=="aqua" + # Xlib SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj -SHL1STDLIBS+= -lfontconfig $(FREETYPELIB) -lX11 -lXrender -.ENDIF +SHL1STDLIBS+= -lfontconfig -lX11 -lXrender -lpixman-1 $(FREETYPE_LIBS) +CFLAGS+=$(FREETYPE_CFLAGS) + +.ENDIF # "$(GUIBASE)"=="aqua" .ELSE # "$(GUI)"=="UNX" |