diff options
| author | Tor Lillqvist <tml@iki.fi> | 2021-12-20 12:04:38 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2021-12-22 13:16:34 +0100 |
| commit | 9e01294adb5dfc71beae502be7bc754acfa0bdfd (patch) | |
| tree | a5f0d032200ebb5943dc4db59bbc8e5e27bfbeee /desktop | |
| parent | 13ceaa008e25873bbcc0cf28487ec9e2f18ea399 (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 6 |
1 files changed, 2 insertions, 4 deletions
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,\ |