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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/Library_chartcore.mk | 8 | ||||
| -rw-r--r-- | chart2/Module_chart2.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 75a76556c4a4..b15f6349e17d 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\ glm_headers \ )) -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Library_use_externals,chartcore,\ glew \ )) @@ -119,7 +119,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/main/VPolarTransformation \ chart2/source/view/main/VTitle \ )) -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/main/3DChartObjects \ chart2/source/view/main/GL3DPlotterBase \ @@ -264,12 +264,12 @@ else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,chartcore,\ $(DLOPEN_LIBS) \ )) -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Library_add_libs,chartcore,\ -lGL \ -lX11 \ )) -endif #ENABLE_OPENGL +endif #!ENABLE_HEADLESS endif diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 3b32e1cc5c01..5a88f1827207 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,chart2,\ Library_chartcontroller \ Library_chartcore \ )) -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Module_add_targets,chart2,\ Library_chartopengl \ Package_opengl \ |