diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-14 12:54:13 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:08 +0100 |
| commit | 5c4f872a77b9b0cd5f061c06c5b771c1aeff4c59 (patch) | |
| tree | 5423bbe184c1978393d1944237f4c7b4a2583f5d /vcl/unx/generic/gdi/salbmp.cxx | |
| parent | 8f5c2a559ac4190db36a1fa85ba965f3cceab5ed (diff) | |
build properly with or without Skia enabled
Change-Id: I5106f13682963b81753f79c3203d4ef7387664fe
Diffstat (limited to 'vcl/unx/generic/gdi/salbmp.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 9891447935e7..b34b1a80e0e0 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -42,8 +42,12 @@ #include <o3tl/safeint.hxx> #include <opengl/salbmp.hxx> #include <vcl/opengl/OpenGLHelper.hxx> -#include <skia/salbmp.hxx> + +#include <config_features.h> +#if HAVE_FEATURE_SKIA #include <vcl/skia/SkiaHelper.hxx> +#include <skia/salbmp.hxx> +#endif #if defined HAVE_VALGRIND_HEADERS #include <valgrind/valgrind.h> @@ -54,9 +58,12 @@ std::shared_ptr<SalBitmap> X11SalInstance::CreateSalBitmap() { +#if HAVE_FEATURE_SKIA if (SkiaHelper::isVCLSkiaEnabled()) return std::make_shared<SkiaSalBitmap>(); - else if (OpenGLHelper::isVCLOpenGLEnabled()) + else +#endif + if (OpenGLHelper::isVCLOpenGLEnabled()) return std::make_shared<OpenGLSalBitmap>(); else return std::make_shared<X11SalBitmap>(); |