From 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 Mon Sep 17 00:00:00 2001
From: Oliver Specht <oliver.specht@cib.de>
Date: Wed, 23 Mar 2016 13:40:13 +0100
Subject: 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>
---
 vcl/workben/vcldemo.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'vcl/workben')

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 507fdc493575..f47dc318c608 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -45,13 +45,14 @@
 #include <opengl/zone.hxx>
 
 // internal headers for OpenGLTests class.
+#if HAVE_FEATURE_OPENGL
 #include "salgdi.hxx"
 #include "salframe.hxx"
 #include "openglgdiimpl.hxx"
 #include "opengl/texture.hxx"
 #include "opengl/framebuffer.hxx"
 #include <vcl/opengl/OpenGLHelper.hxx>
-
+#endif
 #include <rtl/math.hxx>
 
 #define FIXME_SELF_INTERSECTING_WORKING 0
@@ -2234,13 +2235,15 @@ public:
             VclPtr<DemoPopup> xPopup;
 
             aMainWin->SetText("Interactive VCL demo #1");
-
+#if HAVE_FEATURE_OPENGL
             if (bGLTest)
             {
                 OpenGLTests aTests;
                 return aTests.execute();
             }
-            else if (bWidgets)
+            else
+#endif
+                 if (bWidgets)
                 xWidgets = VclPtr< DemoWidgets >::Create ();
             else if (bPopup)
                 xPopup = VclPtrInstance< DemoPopup> ();
-- 
cgit