Kaydet (Commit) cb8e0034 authored tarafından Andras Timar's avatar Andras Timar Kaydeden (comit) Caolán McNamara

Partially revert "svx, canvas, desktop: gb_OBJCXXFLAGS are not needed at all"

This reverts commit 601d7d38.

desktop and svx need these flags in case of OS X sandboxing

Change-Id: Ib811aa53bc2d71839961cdcea0dd4836ebdbc38c
(cherry picked from commit 57117cf5)
Reviewed-on: https://gerrit.libreoffice.org/16572Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 57eb9359
...@@ -63,12 +63,22 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ...@@ -63,12 +63,22 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
$(gb_OBJCXXFLAGS) \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\ $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
Foundation \ Foundation \
)) ))
endif endif
ifeq ($(OS),IOS)
$(eval $(call gb_Library_add_cflags,sofficeapp,\
$(gb_OBJCFLAGS) \
))
endif
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/app/app \ desktop/source/app/app \
desktop/source/app/appinit \ desktop/source/app/appinit \
......
...@@ -91,6 +91,10 @@ $(eval $(call gb_Library_use_externals,svxcore,\ ...@@ -91,6 +91,10 @@ $(eval $(call gb_Library_use_externals,svxcore,\
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_cxxflags,svxcore,\
$(gb_OBJCXXFLAGS) \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\ $(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
Foundation \ Foundation \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment