diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-11-16 21:14:00 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-11-16 21:32:03 +0200 |
commit | 73302ce8b8cb1be588f2fb635b20faa792d5f4f8 (patch) | |
tree | d75c1a7a51b2aa0f1c450ff97908e70c5693dfa4 /RepositoryExternal.mk | |
parent | 2a91304bddf3b1a7b788b120e6374cc1fb9ea045 (diff) |
Exit GLyphy
Change-Id: Ib84e703d4c1528d022435c7695c97a3fc284563a
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b52927a10a6d..9650bf98253e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -229,44 +229,6 @@ endef endif # SYSTEM_GLEW -ifneq ($(SYSTEM_GLYPHY),) - -define gb_LinkTarget__use_glyphy -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(GLYPHY_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(GLYPHY_LIBS)) - -endef -else # !SYSTEM_GLYPHY - -$(eval $(call gb_Helper_optional,GLYPHY,$(call gb_Helper_register_packages_for_install,ooo,\ - glyphy \ -))) - -define gb_LinkTarget__use_glyphy -$(call gb_LinkTarget_use_package,$(1),glyphy) - -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,glyphy/src) \ - $$(INCLUDE) \ -) - -ifeq ($(COM),MSC) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,glyphy)/src/.libs/libglyphy.lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,glyphy)/src/.libs -lglyphy \ -) -endif - -endef - -endif # SYSTEM_GLYPHY - define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) |