summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-06-29 12:35:53 +0200
committerAndras Timar <andras.timar@collabora.com>2015-06-29 12:49:12 +0200
commit57117cf52d4c91029cbabf852d1f82c386ac1d75 (patch)
tree74ca7641af9afb8acda60edf7e12f4e658d37c36 /desktop
parentb3307f57fa8bae9736977aa72597dc4ea958a7ec (diff)
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
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Library_sofficeapp.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index b1d9d217df5d..55f6fba11f54 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 \