[Libreoffice-commits] .: vcl/Library_vcl.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 19 08:44:55 PDT 2012


 vcl/Library_vcl.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 1a6a3a12a9247ad18bc68d77b48229e457c7a9c0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Oct 19 18:42:56 2012 +0300

    In the 10.7 SDK CoreText is in the ApplicationServices framework
    
    Although I don't understand why this worked before, huh.
    
    Change-Id: I67ea314330630f331acaabd1c47128de6e340bb2

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d1dbad6..1ff3339 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -353,9 +353,15 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/aqua/source/gdi/coretext/salgdi \
 ))
 
+ifeq ($(MACOSX_SDK_VERSION),1070)
+$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
+	ApplicationServices \
+))
+else
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 	CoreText \
 ))
+endif
 
 else # ATSUI
 


More information about the Libreoffice-commits mailing list