From e13aead8a19c65144fc254f9e3a694584ab1777c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Aug 2016 22:12:29 +0300 Subject: Reduce ENABLE_OPENGL / ENABLE_HEADLESS confusion ENABLE_OPENGL means whether to enable the OpenGL slideshow transition code. It does not mean whether to enable use of OpenGL in general. So rename it to ENABLE_OPENGL_TRANSITIONS while at it. ENABLE_HEADLESS means whether to disable use of X11 and OpenGL on X11 (and Wayland) platforms, I think, meaning Linux and maybe Solaris and the BSDs. Maybe it should be renamed to DISABLE_X11_AND_OPENGL. Change-Id: Ibb30f51646b1bcc477fe691a3fa38c7a1e3944ae --- postprocess/Rdb_services.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'postprocess/Rdb_services.mk') diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index c411fc193e50..775022a659de 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -213,7 +213,7 @@ $(eval $(call gb_Rdb_add_components,services,\ extensions/source/update/check/updchk.uno \ extensions/source/update/ui/updchk \ ) \ - $(if $(ENABLE_OPENGL), \ + $(if $(ENABLE_OPENGL_TRANSITIONS), \ slideshow/source/engine/OGLTrans/ogltrans \ ) \ $(if $(ENABLE_TDE), \ @@ -229,10 +229,8 @@ $(eval $(call gb_Rdb_add_components,services,\ wizards/com/sun/star/wizards/report/report \ wizards/com/sun/star/wizards/table/table \ ) \ - $(if $(ENABLE_OPENGL), \ - $(if $(ENABLE_GLTF), \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \ - ) \ + $(if $(ENABLE_GLTF), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \ ) \ )) -- cgit