desktop/Library_sofficeapp.mk | 6 ++---- postprocess/Rdb_services.mk | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit 9e01294adb5dfc71beae502be7bc754acfa0bdfd Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Dec 20 12:04:38 2021 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Wed Dec 22 13:16:34 2021 +0100 The value for $(OS) when building for iOS is "iOS", not "IOS" But we probably do want to compile lokclipboard.cxx for iOS, as otherwise the iOS app when built from the master branch of online and this branch of core will not link, as init.cxx contains unconditional references to stuff from lokclipboard.cxx. As such it would make sense to put all references to lokclipboard stuff inside #ifndef IOS, because we don't need to and don't want to use any own LOKClipboard in the iOS app. We use the system clipboard, using code in vcl/ios. Once that is done, lokclipboard.cxx can be dropped for iOS. For the postprocess/Rdb_services.mk, make it do what it de facto did always anyway (as $(OS) never was "IOS"). Change-Id: I7445157108f51cb6e54c62c44bae593cae69d792 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127146 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index d66be2519821..91f992e4501f 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -156,13 +156,11 @@ ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ desktop/source/lib/lokinteractionhandler \ - $(if $(filter-out $(OS),IOS), \ - desktop/source/lib/lokclipboard) \ + desktop/source/lib/lokclipboard \ $(if $(filter $(OS),ANDROID), \ desktop/source/lib/lokandroid) \ )) -$(if $(filter-out $(OS),IOS), \ - $(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard))) +$(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard)) else ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 78c74ba0047e..75cbc02a4004 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -341,9 +341,8 @@ endif # lokclipboard.component ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),) -$(if $(filter-out $(OS),IOS), \ - $(eval $(call gb_Rdb_add_components,services,\ - desktop/lokclipboard))) +$(eval $(call gb_Rdb_add_components,services,\ + desktop/lokclipboard)) else ifeq ($(USING_X11),TRUE) $(eval $(call gb_Rdb_add_components,services,\
