Kaydet (Commit) 601d7d38 authored tarafından Douglas Mencken's avatar Douglas Mencken Kaydeden (comit) Michael Stahl

svx, canvas, desktop: gb_OBJCXXFLAGS are not needed at all

Change-Id: Iea164e00262822d571f2c49665165795706a57a4
Reviewed-on: https://gerrit.libreoffice.org/13645Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 9b87116f
...@@ -25,24 +25,12 @@ $(eval $(call gb_Library_use_sdk_api,cairocanvas)) ...@@ -25,24 +25,12 @@ $(eval $(call gb_Library_use_sdk_api,cairocanvas))
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_cxxflags,cairocanvas,\
$(gb_OBJCXXFLAGS) \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,cairocanvas,\ $(eval $(call gb_Library_use_system_darwin_frameworks,cairocanvas,\
Cocoa \ Cocoa \
)) ))
endif endif
ifeq ($(OS),IOS)
$(eval $(call gb_Library_add_cxxflags,cairocanvas,\
$(gb_OBJCXXFLAGS) \
))
endif
$(eval $(call gb_Library_use_libraries,cairocanvas,\ $(eval $(call gb_Library_use_libraries,cairocanvas,\
sal \ sal \
cppu \ cppu \
......
...@@ -67,22 +67,12 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ...@@ -67,22 +67,12 @@ $(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 \
......
...@@ -92,10 +92,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\ ...@@ -92,10 +92,6 @@ $(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