Kaydet (Commit) ce43b10c authored tarafından Thorsten Behrens's avatar Thorsten Behrens

get headless build to work again for Linux

This makes --disable-gui option build successfully again - which
means we again run on a headless server w/o any X11 or OpenGL libs.

Change-Id: I60019af571aecdac277adbe6d34d5fff065014f9
Reviewed-on: https://gerrit.libreoffice.org/50214Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst b37a46fd
...@@ -2016,7 +2016,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis, ...@@ -2016,7 +2016,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
return; return;
} }
#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS) #if defined(UNX) && !defined(MACOSX)
#if defined(IOS) #if defined(IOS)
SystemGraphicsData aData; SystemGraphicsData aData;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "splashx.h" #include "splashx.h"
#ifdef ENABLE_QUICKSTART_LIBPNG #if defined(ENABLE_QUICKSTART_LIBPNG) && !defined(LIBO_HEADLESS)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
......
...@@ -562,8 +562,10 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) ...@@ -562,8 +562,10 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle)
OUString sVersion = ::utl::Bootstrap::getBuildIdData("development"); OUString sVersion = ::utl::Bootstrap::getBuildIdData("development");
sTitle.append(" ["); sTitle.append(" [");
sTitle.append(sVersion); sTitle.append(sVersion);
#ifndef LIBO_HEADLESS
if (OpenGLWrapper::isVCLOpenGLEnabled()) if (OpenGLWrapper::isVCLOpenGLEnabled())
sTitle.append("-GL"); sTitle.append("-GL");
#endif
sTitle.append("]"); sTitle.append("]");
} }
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment