diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-12-10 14:59:37 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-12-10 14:59:37 +0100 |
| commit | 7e34142abaa37a73f0846b00f08c39a423dc7c54 (patch) | |
| tree | c7919b1614fa331f09b2ed7e74c393b44cb99877 | |
| parent | 212eeafce47b35214f01964696637669884426f2 (diff) | |
Use FONTCONFIG_LIBS rather than -lfontconfig
And add some spaces.
| -rw-r--r-- | canvas/source/cairo/makefile.mk | 4 | ||||
| -rw-r--r-- | vcl/unx/source/fontmanager/makefile.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk index b0ff10fe96b0..5c0d237da821 100644 --- a/canvas/source/cairo/makefile.mk +++ b/canvas/source/cairo/makefile.mk @@ -98,8 +98,8 @@ CFLAGSCXX+=$(OBJCXXFLAGS) # Xlib SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj -SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS) -CFLAGS+=$(FREETYPE_CFLAGS) +SHL1STDLIBS+= $(FONTCONFIG_LIBS) -lX11 -lXrender $(FREETYPE_LIBS) +CFLAGS+= $(FREETYPE_CFLAGS) .ENDIF # "$(GUIBASE)"=="aqua" diff --git a/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk index 980bc9f3cbd0..1e2097f46a9c 100644 --- a/vcl/unx/source/fontmanager/makefile.mk +++ b/vcl/unx/source/fontmanager/makefile.mk @@ -42,8 +42,8 @@ INCDEPN+= -I..$/fontsubset CDEFS += -DENABLE_FONTCONFIG .ENDIF -CFLAGS+=$(FREETYPE_CFLAGS) -CFLAGS+=$(FONTCONFIG_CFLAGS) +CFLAGS+= $(FREETYPE_CFLAGS) +CFLAGS+= $(FONTCONFIG_CFLAGS) # --- Files -------------------------------------------------------- .IF "$(GUIBASE)"=="aqua" |