[Libreoffice-commits] .: vcl/source vcl/unx

[Fridrich Strba]

 vcl/source/gdi/makefile.mk     |    3 +++
 vcl/source/glyphs/makefile.mk  |    4 ++++
 vcl/unx/source/gdi/makefile.mk |    3 +++
 3 files changed, 10 insertions(+)

New commits:
commit 817ec499de576a917bc6db38a075c041fe086464
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 15 21:53:46 2011 +0100

    Internal graphite is a static library

diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index 451d446..ee12daa 100644
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -43,6 +43,9 @@ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
 .ENDIF
 .IF "$(ENABLE_GRAPHITE)" == "TRUE"
 CDEFS+=-DENABLE_GRAPHITE
+.IF "$(SYSTEM_GRAPHITE)" != "YES"
+CDEFS+=-DGR2_STATIC
+.ENDIF
 .ENDIF
 
 # --- Files --------------------------------------------------------
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
index 6bd64cd..cbc9a38 100644
--- a/vcl/source/glyphs/makefile.mk
+++ b/vcl/source/glyphs/makefile.mk
@@ -67,6 +67,10 @@ SLOFILES=\
         $(SLO)$/graphite_features.obj	\
         $(SLO)$/graphite_layout.obj
 
+.IF "$(SYSTEM_GRAPHITE)" != "YES"
+CDEFS+=-DGR2_STATIC
+.ENDIF
+
 .ENDIF
 .ENDIF
 
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
index 871d12a..8afbcec 100644
--- a/vcl/unx/source/gdi/makefile.mk
+++ b/vcl/unx/source/gdi/makefile.mk
@@ -95,6 +95,9 @@ CFLAGS+=-DXRENDER_LINK
 
 .IF "$(ENABLE_GRAPHITE)" == "TRUE"
 CFLAGS+=-DENABLE_GRAPHITE
+.IF "$(SYSTEM_GRAPHITE)" != "YES"
+CDEFS+=-DGR2_STATIC
+.ENDIF
 .ENDIF
 
 .ENDIF	# "$(GUIBASE)"!="unx"