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 | |
| 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')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 10 | ||||
| -rw-r--r-- | avmedia/Library_avmediaogl.mk | 3 | ||||
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index b8809f7b0967..f09182257d0d 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -25,9 +25,15 @@ $(eval $(call gb_Library_add_defs,avmedia,\ $(eval $(call gb_Library_use_externals,avmedia,\ boost_headers \ - glew \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_use_externals,avmedia,\ + glew \ +)) +endif + + $(eval $(call gb_Library_use_libraries,avmedia,\ comphelper \ ucbhelper \ @@ -45,10 +51,12 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ )) ifeq ($(ENABLE_GLTF),TRUE) +ifeq ($(ENABLE_OPENGL),TRUE) $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/modeltools \ )) endif +endif ifeq ($(ENABLE_COLLADA),TRUE) diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index b7498bfb1a15..24133b866999 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -7,6 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +ifeq ($(ENABLE_OPENGL),TRUE) $(eval $(call gb_Library_Library,avmediaogl)) $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl)) @@ -56,5 +57,5 @@ $(eval $(call gb_Library_add_libs,avmediaogl,\ -lGL \ )) endif - +endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 06af36f7915a..ff5ba90bda98 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ )) endif -ifeq ($(ENABLE_GLTF),TRUE) +ifeq ($(ENABLE_OPENGL),TRUE) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaogl \ )) 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; } |