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/source/app/svapp.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/source/app/svapp.cxx')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 20bdca4a1cd1..9c874a9ea7a3 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -51,7 +51,9 @@ #include <vcl/scheduler.hxx> #include <vcl/unohelp.hxx> #include <vcl/lazydelete.hxx> +#if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> +#endif #include "salinst.hxx" #include "salframe.hxx" @@ -1220,9 +1222,11 @@ OUString Application::GetHWOSConfInfo() aDetails.append( "; " ); aDetails.append( VclResId(SV_APP_UIRENDER).toString() ); +#if HAVE_FEATURE_OPENGL if ( OpenGLWrapper::isVCLOpenGLEnabled() ) aDetails.append( VclResId(SV_APP_GL).toString() ); else +#endif aDetails.append( VclResId(SV_APP_DEFAULT).toString() ); aDetails.append( "; " ); |