[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/Library_vcl.mk

Tor Lillqvist tml at collabora.com
Fri Oct 18 00:04:23 PDT 2013


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

New commits:
commit 01c3253c8e28f6be7f2cc31a6c5e97a19b7eeeba
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 15 18:53:34 2013 +0300

    Fix build against the 10.8 SDK
    
    Change-Id: I74adcca901e9a7c31d02779b1ee853731a55ea43
    Reviewed-on: https://gerrit.libreoffice.org/6253
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4e3df9b..ad59af9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -370,6 +370,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     $(vcl_coretext_code) \
 ))
 
+ifeq ($(MACOSX_SDK_VERSION),1080)
+$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
+	ApplicationServices \
+))
+else
 ifeq ($(MACOSX_SDK_VERSION),1070)
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 	ApplicationServices \
@@ -385,6 +390,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 ))
 endif
 endif
+endif
 
 else # ATSUI
 


More information about the Libreoffice-commits mailing list