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 /slideshow | |
| 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 'slideshow')
| -rw-r--r-- | slideshow/Library_slideshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/Module_slideshow.mk | 8 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index af2861629907..3834dfdc4efe 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -28,8 +28,12 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in $(eval $(call gb_Library_use_externals,slideshow,\ boost_headers \ - glew \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_use_externals,slideshow,\ + glew \ + )) +endif $(eval $(call gb_Library_use_sdk_api,slideshow)) diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk index 5d9978b09825..01d1058c16be 100644 --- a/slideshow/Module_slideshow.mk +++ b/slideshow/Module_slideshow.mk @@ -10,10 +10,14 @@ $(eval $(call gb_Module_Module,slideshow)) $(eval $(call gb_Module_add_targets,slideshow,\ - $(if $(filter TRUE,$(ENABLE_OPENGL)),Library_OGLTrans) \ Library_slideshow \ - Package_opengl \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Module_add_targets,slideshow,\ + Library_OGLTrans \ + Package_opengl \ + )) +endif # not working # CppunitTest_slideshow \ diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 4a21f1af49dc..2fc4ea24f587 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -46,7 +46,9 @@ #include <avmedia/mediawindow.hxx> #include <avmedia/modeltools.hxx> +#if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLContext.hxx> +#endif #include <com/sun/star/media/XManager.hpp> #include <com/sun/star/media/XPlayer.hpp> @@ -449,7 +451,7 @@ namespace slideshow rRangePix.getMinY(), rRangePix.getMaxX() - rRangePix.getMinX(), rRangePix.getMaxY() - rRangePix.getMinY() ); -#if !HAVE_FEATURE_GLTF +#if !HAVE_FEATURE_GLTF || !HAVE_FEATURE_OPENGL (void)rMimeType; #else if( avmedia::IsModel(rMimeType) ) |