summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-08-24 08:33:42 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-08-24 08:33:42 +0000
commit36053907a3d609b938e43b9842c3926ec522ff09 (patch)
treeb56db8a57ae4914211292326723406dfefb7e1b2 /vcl
parentaf9e732c94a594dfa1b283bed80a9e66a2e94681 (diff)
#i10000# build fix
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/glyphs/makefile.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
index 13da4a64f1a0..3e79cdc63da2 100644
--- a/vcl/source/glyphs/makefile.mk
+++ b/vcl/source/glyphs/makefile.mk
@@ -49,24 +49,28 @@ CFLAGS+=-DUSE_FT_EMBOLDEN
# --- Files --------------------------------------------------------
.IF "$(USE_BUILTIN_RASTERIZER)" != ""
+# GlyphCache + FreeType support (only on UNX platforms currently)
SLOFILES=\
$(SLO)$/glyphcache.obj \
$(SLO)$/gcach_rbmp.obj \
$(SLO)$/gcach_layout.obj \
$(SLO)$/gcach_ftyp.obj
-#.IF "$(ENABLE_GRAPHITE)" != ""
-#CFLAGS+=-DENABLE_GRAPHITE
-#SLOFILES+= $(SLO)$/graphite_adaptors.obj \
+.IF "$(ENABLE_GRAPHITE)" != ""
+# Graphite support using the glyphcache infrastructure
+CFLAGS+=-DENABLE_GRAPHITE
+SLOFILES+= $(SLO)$/graphite_adaptors.obj \
$(SLO)$/graphite_features.obj \
$(SLO)$/graphite_cache.obj \
$(SLO)$/graphite_textsrc.obj \
$(SLO)$/graphite_serverfont.obj \
$(SLO)$/graphite_layout.obj
-#.ENDIF
+.ENDIF
+
+.ELSE
-#.ELSE
.IF "$(ENABLE_GRAPHITE)" == "TRUE"
+# Graphite support on non-UNX platforms
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
SLOFILES=\