[Libreoffice-commits] core.git: vcl/inc vcl/ios vcl/quartz
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 23 16:44:31 UTC 2021
vcl/inc/quartz/salgdi.h | 1 +
vcl/ios/salios.cxx | 2 +-
vcl/quartz/salgdi.cxx | 3 +++
3 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e2a54acaf123c61e3be291f8c84a88effae880a1
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Aug 23 18:06:51 2021 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Aug 23 18:43:57 2021 +0200
Make compilation for iOS get a bit further
Note that I did not try to refresh my memory of what anything of this
actually *means*, I just did a couple of quick edits to get past
compilation errors in vcl.
The build now proceeds until "No rule to make target
'/Volumes/TML13/lo/master-ios-debug/instdir_for_build/LibreOfficeDev.app/Contents/Frameworks/libgcc3_uno',
needed by
'/Volumes/TML13/lo/master-ios-debug/workdir_for_build/Executable/saxparser.run'."
Change-Id: I42e2d60bf691f99631b2700e45921824144df2d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120892
Tested-by: Tor Lillqvist <tml at collabora.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 80b79a6ec720..5316db0ac1a3 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -33,6 +33,7 @@
#else
#include <CoreGraphics/CoreGraphics.h>
#include <CoreText/CoreText.h>
+#include "salgeom.hxx"
#endif
#include <postmac.h>
diff --git a/vcl/ios/salios.cxx b/vcl/ios/salios.cxx
index c078654286de..249d662de65f 100644
--- a/vcl/ios/salios.cxx
+++ b/vcl/ios/salios.cxx
@@ -109,7 +109,7 @@ void AquaGraphicsBackend::copyBits(const SalTwoRect& rPosAry, SalGraphics *pSrcG
if (pSrcGraphics)
{
AquaSalGraphics* pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
- pSrcShared = &pSrc->getAquaGraphicsBackend()->mrShared;
+ pSrcShared = &pSrc->getAquaGraphicsBackend()->GetShared();
}
else
pSrcShared = &mrShared;
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 53b10ab9533c..1480c0fda6ab 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -200,6 +200,9 @@ AquaSalGraphics::AquaSalGraphics()
#if HAVE_FEATURE_SKIA
if(SkiaHelper::isVCLSkiaEnabled())
mpBackend.reset(new AquaSkiaSalGraphicsImpl(*this, maShared));
+#else
+ if(false)
+ ;
#endif
else
mpBackend.reset(new AquaGraphicsBackend(maShared));
More information about the Libreoffice-commits
mailing list