diff options
author | Michael Stahl <mst@openoffice.org> | 2011-04-13 16:11:39 +0000 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:10:46 +0200 |
commit | 87e4433cdcc7414a556604068917c2d93035b537 (patch) | |
tree | 179021b0ced74bc514f712113d93c34379908c87 /RepositoryExternal.mk | |
parent | gnumake4: adapt makefiles [hg:ec87fcbfae8b] (diff) | |
download | core-87e4433cdcc7414a556604068917c2d93035b537.tar.gz core-87e4433cdcc7414a556604068917c2d93035b537.zip |
gnumake4: #i117610#: move graphite to RepositoryExternal.mk [hg:ca1349af0566]
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e49b814bcbac..5c5c21082920 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -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 |