diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-03 22:12:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-03 22:36:36 +0300 |
| commit | e13aead8a19c65144fc254f9e3a694584ab1777c (patch) | |
| tree | 10d67af40a0ee8dd5784b975fb30dca58a40e09d /postprocess | |
| parent | 1520d30268e1eebabbdf18b9a31bc783ab51d03c (diff) | |
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
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 0d4e93ec5177..186522d43d24 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -441,7 +441,7 @@ postprocess_FILES_onlineupdate := \ $(call gb_XcuModuleTarget_get_target,extensions/source/update/check)/org/openoffice/Office/Jobs-onlineupdate.xcu endif -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_OPENGL_TRANSITIONS),TRUE) postprocess_XCDS += ogltrans.xcd postprocess_DEPS_ogltrans := main postprocess_FILES_ogltrans := \ 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) \ ) \ )) |