From 017bc462b0af467ca89653266674302a9821db5e Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Tue, 1 Jun 2021 18:53:40 +0200 Subject: cairo: Drop config for WNT and MACOSX build It's not used on these platforms since a long time. Change-Id: Idac41f1be0a546fd8aa0dd88709ebfa3255a104e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116555 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- RepositoryExternal.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 688bef98ac1a..2c1bf9c7d79f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1291,7 +1291,7 @@ else # !SYSTEM_CAIRO $(eval $(call gb_Helper_register_packages_for_install,ooo,\ cairo \ - $(if $(filter $(OS),WNT),,pixman) \ + pixman \ )) define gb_LinkTarget__use_cairo @@ -1306,9 +1306,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ - $(if $(filter-out MACOSX WNT,$(OS)), \ -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \ - ) \ ) endef -- cgit