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 /avmedia/source | |
| 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 'avmedia/source')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 6206abb73300..ecd282df5ccf 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -39,8 +39,9 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/media/XManager.hpp> #include <vcl/sysdata.hxx> +#if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLContext.hxx> - +#endif using namespace ::com::sun::star; namespace avmedia { namespace priv { @@ -223,11 +224,13 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR } } #if HAVE_FEATURE_GLTF +#if HAVE_FEATURE_OPENGL else if ( *pMimeType == AVMEDIA_MIMETYPE_JSON ) { xPlayer = createPlayer(rURL, AVMEDIA_OPENGL_MANAGER_SERVICE_NAME, xContext); } #endif +#endif return xPlayer; } |