[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - desktop/Library_sofficeapp.mk svx/Library_svxcore.mk

[Andras Timar]

 desktop/Library_sofficeapp.mk |   10 ++++++++++
 svx/Library_svxcore.mk        |    4 ++++
 2 files changed, 14 insertions(+)

New commits:
commit cb8e0034d6bac557277c86d4819f3bea476db892
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 29 12:35:53 2015 +0200

    Partially revert "svx, canvas, desktop: gb_OBJCXXFLAGS are not needed at all"
    
    This reverts commit 601d7d38628bf93218fba15249c4654ae24e7396.
    
    desktop and svx need these flags in case of OS X sandboxing
    
    Change-Id: Ib811aa53bc2d71839961cdcea0dd4836ebdbc38c
    (cherry picked from commit 57117cf52d4c91029cbabf852d1f82c386ac1d75)
    Reviewed-on: https://gerrit.libreoffice.org/16572
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 91c7a51..467fecc 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -63,12 +63,22 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 
 ifeq ($(OS),MACOSX)
 
+$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
+    $(gb_OBJCXXFLAGS) \
+))
+
 $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
     Foundation \
 ))
 
 endif
 
+ifeq ($(OS),IOS)
+$(eval $(call gb_Library_add_cflags,sofficeapp,\
+    $(gb_OBJCFLAGS) \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
     desktop/source/app/app \
     desktop/source/app/appinit \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index c73b42f..51e2bab 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -91,6 +91,10 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 
 ifeq ($(OS),MACOSX)
 
+$(eval $(call gb_Library_add_cxxflags,svxcore,\
+    $(gb_OBJCXXFLAGS) \
+))
+
 $(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
 	Foundation \
 ))