[ooo-build-commit] Branch 'ooo/master' - 2 commits - vcl/source vcl/util

[Jan Holesovsky]

 vcl/source/glyphs/makefile.mk |   14 +++++++++-----
 vcl/util/makefile.mk          |    2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 1db0b6ea9e1a18889a10c3abaa1a0d90588b7ce2
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Aug 24 09:30:13 2009 +0000

    #i10000# build fix

diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index dd17637..4c0cd7d 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -213,7 +213,7 @@ LIB1FILES+= \
 SHL1LIBS=   $(LIB1TARGET)
 .IF "$(GUI)"!="UNX"
 .IF "$(COM)"!="GCC"
-SHL1OBJS=   $(SLO)$/salshl.obj
+#SHL1OBJS=   $(SLO)$/salshl.obj
 .ENDIF
 .ENDIF
 
commit a40daa3db75e43e8af6ee73703333c7cad0cdf23
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Aug 24 08:33:42 2009 +0000

    #i10000# build fix

diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
index 13da4a6..3e79cdc 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=\