summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-08-03 22:12:29 +0300
committerTor Lillqvist <tml@collabora.com>2016-08-03 22:36:36 +0300
commite13aead8a19c65144fc254f9e3a694584ab1777c (patch)
tree10d67af40a0ee8dd5784b975fb30dca58a40e09d /slideshow
parent1520d30268e1eebabbdf18b9a31bc783ab51d03c (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 'slideshow')
-rw-r--r--slideshow/Library_slideshow.mk2
-rw-r--r--slideshow/Module_slideshow.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3834dfdc4efe..3a9aac6ad245 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in
$(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,slideshow,\
glew \
))
diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk
index 01d1058c16be..8d98a97a2e90 100644
--- a/slideshow/Module_slideshow.mk
+++ b/slideshow/Module_slideshow.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,slideshow))
$(eval $(call gb_Module_add_targets,slideshow,\
Library_slideshow \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL_TRANSITIONS),TRUE)
$(eval $(call gb_Module_add_targets,slideshow,\
Library_OGLTrans \
Package_opengl \