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/unx | |
| 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/unx')
| -rw-r--r-- | vcl/unx/generic/app/geninst.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx index 99b992c39747..daf54b05879d 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx @@ -29,8 +29,10 @@ #include <osl/module.hxx> #include <comphelper/solarmutex.hxx> +#include <config_features.h> +#if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLContext.hxx> - +#endif #include "unx/geninst.h" // SalYieldMutex @@ -60,7 +62,9 @@ void SalYieldMutex::release() assert(mnThreadId == osl::Thread::getCurrentIdentifier()); if ( mnCount == 1 ) { +#if HAVE_FEATURE_OPENGL OpenGLContext::prepareForYield(); +#endif mnThreadId = 0; } mnCount--; |