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/win/app/salinst.cxx | |
| parent | 8f5c2a559ac4190db36a1fa85ba965f3cceab5ed (diff) | |
build properly with or without Skia enabled
Change-Id: I5106f13682963b81753f79c3203d4ef7387664fe
Diffstat (limited to 'vcl/win/app/salinst.cxx')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 20c6d3c8a9f7..b490b34917b7 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -32,13 +32,11 @@ #include <vcl/inputtypes.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/opengl/OpenGLContext.hxx> -#include <vcl/skia/SkiaHelper.hxx> #include <vcl/timer.hxx> #include <vclpluginapi.h> #include <opengl/salbmp.hxx> #include <opengl/win/gdiimpl.hxx> -#include <skia/salbmp.hxx> #include <win/wincomp.hxx> #include <win/salids.hrc> #include <win/saldata.hxx> @@ -49,6 +47,12 @@ #include <win/salbmp.h> #include <win/winlayout.hxx> +#include <config_features.h> +#include <vcl/skia/SkiaHelper.hxx> +#if HAVE_FEATURE_SKIA +#include <skia/salbmp.hxx> +#endif + #include <salsys.hxx> #include <desktop/crashreport.hxx> @@ -967,9 +971,12 @@ SalTimer* WinSalInstance::CreateSalTimer() std::shared_ptr<SalBitmap> WinSalInstance::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<WinSalBitmap>(); |