summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@oracle.com>2011-04-04 11:46:36 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 13:27:40 +0200
commit74dd991997e0ce52ab31aec63b0bb05c587e228c (patch)
tree134f8ff9ab5e576ea1e8e5ba4ba8000d41667c59
parent45bf496656a7c4cd69ee055a72cf9d8c37e7e806 (diff)
ooo34gsl01: #i117680# add ADAPT_EXT_STL define as was before gnumake conversion [hg:43c445bd771c]
-rwxr-xr-xvcl/Library_vcl.mk11
1 files changed, 11 insertions, 0 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7e2269580fda..558e1ec8251e 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -427,6 +427,17 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/glyphs/graphite_layout \
vcl/source/glyphs/graphite_textsrc \
))
+
+#building with stlport, but graphite was not built with stlport
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(SYSTEM_GRPAHITE),YES)
+$(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DADAPT_EXT_STL \
+))
+endif
+endif
+
# handle X11 platforms, which have additional files and possibly system graphite
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_exception_objects,vcl,\