[Libreoffice-commits] .: RepositoryExternal.mk

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Sun Jul 24 14:00:58 PDT 2011


 RepositoryExternal.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2d92391dfc7e9cbf0029455bc86bdc49593e710f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jul 24 16:00:24 2011 -0500

    pixman-1 appears to be a static lib on MacOS when using internal one

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bc44b89..cc6c36e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -244,10 +244,16 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
 	cairo \
 )
 ifneq ($(OS),WNT)
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_add_static_libs,$(1),\
+	pixman-1 \
+)
+else
 $(call gb_LinkTarget_add_linked_libs,$(1),\
 	pixman-1 \
 )
 endif
+endif
 endef
 
 endif # SYSTEM_CAIRO


More information about the Libreoffice-commits mailing list