* [Buildroot] [git commit branch/2020.05.x] package/cegui: fix selecting the default OpenGL renderer
@ 2020-08-13 17:02 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2020-08-13 17:02 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=2eeb5a8ed360b4f095e8a21391e2f37894d3f11c
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.05.x
According to the cegui requirements select explicitly the default
OpenGL renderer based on available dependencies.
Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 44b14947938c813e023db77ce06b8c0d4cdb0558)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/cegui/Config.in | 1 +
package/cegui/cegui.mk | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/package/cegui/Config.in b/package/cegui/Config.in
index f917be0cc5..1bd0ee1cc3 100644
--- a/package/cegui/Config.in
+++ b/package/cegui/Config.in
@@ -9,6 +9,7 @@ config BR2_PACKAGE_CEGUI
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_WCHAR
select BR2_PACKAGE_GLM
+ select BR2_PACKAGE_LIBGLFW if BR2_PACKAGE_HAS_LIBGL # SampleBrowser dependency
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Crazy Eddie's GUI System is a free library providing windowing
diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk
index 6158ef129c..12b2712f33 100644
--- a/package/cegui/cegui.mk
+++ b/package/cegui/cegui.mk
@@ -16,15 +16,24 @@ CEGUI_DEPENDENCIES = glm \
$(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
$(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \
$(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \
- $(if $(BR2_PACKAGE_LIBGLEW),libglew) \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
# libepoxy support cannot be enabled together with libglew
-ifeq ($(BR2_PACKAGE_LIBEPOXY):$(BR2_PACKAGE_LIBGLEW),y:)
+ifeq ($(BR2_PACKAGE_LIBGLEW)$(BR2_PACKAGE_LIBGLU),yy)
+CEGUI_DEPENDENCIES += libglew libglu
+CEGUI_CONF_OPTS += -DCEGUI_USE_GLEW=ON -DCEGUI_USE_EPOXY=OFF \
+ -DCEGUI_BUILD_RENDERER_OPENGL=ON \
+ -DCEGUI_BUILD_RENDERER_OPENGL3=ON
+else ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
CEGUI_DEPENDENCIES += libepoxy
-CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=ON
+# old OpenGL renderer module is only supported using GLEW
+CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=ON -DCEGUI_USE_GLEW=OFF \
+ -DCEGUI_BUILD_RENDERER_OPENGL=OFF \
+ -DCEGUI_BUILD_RENDERER_OPENGL3=ON
else
-CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF
+CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF -DCEGUI_USE_GLEW=OFF \
+ -DCEGUI_BUILD_RENDERER_OPENGL=OFF \
+ -DCEGUI_BUILD_RENDERER_OPENGL3=OFF
endif
ifeq ($(BR2_PACKAGE_EXPAT),y)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-13 17:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 17:02 [Buildroot] [git commit branch/2020.05.x] package/cegui: fix selecting the default OpenGL renderer Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.