diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:40:13 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-25 11:05:47 +0000 |
| commit | 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch) | |
| tree | 1482b9e0b899a783f64aaed3b9728533a81eff58 /vcl/headless/svpgdi.cxx | |
| parent | 44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff) | |
fix headless build
disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test
Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'vcl/headless/svpgdi.cxx')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 15c6f7b147a4..e1292cef035f 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -36,9 +36,11 @@ #include <cairo.h> -#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0) +#if ENABLE_CAIRO_CANVAS +#if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0) # define CAIRO_OPERATOR_DIFFERENCE (static_cast<cairo_operator_t>(23)) #endif +#endif namespace { |