gnumake4: #i117610#: move graphite to RepositoryExternal.mk [hg:ca1349af0566]

This commit is contained in:
Michael Stahl
2011-06-17 14:10:46 +02:00
committed by Bjoern Michaelsen
parent 73d2fe983d
commit 87e4433cdc
2 changed files with 30 additions and 1 deletions
-1
View File
@@ -155,7 +155,6 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
graphite \
ooopathutils \
salcpprt \
vclmain \
+30
View File
@@ -258,6 +258,36 @@ endef
endif # SYSTEM_CAIRO
ifeq ($(SYSTEM_GRAPHITE),YES)
#check for building with stlport, but graphite was not built with stlport
define gb_LinkTarget__use_graphite
ifneq ($(USE_SYSTEM_STL),YES)
$(call gb_LinkTarget_add_defs,$(1),\
-DADAPT_EXT_STL \
)
endif
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(GRAPHITE_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
endef
else # !SYSTEM_GRAPHITE
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
graphite \
))
define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
graphite \
)
endef
endif # SYSTEM_GRAPHITE
ifeq ($(SYSTEM_ICU),YES)
define gb_LinkTarget__use_icuuc