On 9/10/2011 13:35, [email protected] wrote:
Author: erack
Date: Sat Sep 10 17:35:58 2011
New Revision: 1167563
URL: http://svn.apache.org/viewvc?rev=1167563&view=rev
Log:
ooo34gsl01: #i117680# add ADAPT_EXT_STL define as was before gnumake conversion
# User Philipp Lohmann [pl]<[email protected]>
Modified:
incubator/ooo/trunk/main/vcl/Library_vcl.mk
Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1167563&r1=1167562&r2=1167563&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Sat Sep 10 17:35:58 2011
@@ -427,6 +427,17 @@ $(eval $(call gb_Library_add_exception_o
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,\
Typo warning: s/GRPAHITE/GRAPHITE/
--
/tj/
