package/cegui: fix selecting the default OpenGL renderer
PATCH 1/1 package/cegui: fix selecting the default OpenGL renderer
According to the cegui requirements select explicit the default OpenGL renderer based on available possibilities.
Signed-off-by Bartosz Bilas <[email protected]>
--- package/cegui/Config.in | 1 + package/cegui/cegui.mk | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
package/cegui/Config.in +1 -0
@@ -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
package/cegui/cegui.mk +14 -4
@@ -16,15 +16,25 @@ 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_LIBGLFW),libglfw) \ $(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)
Signature · 1 line
2.27.0
Thomas Petazzoni
AppliedPATCH 1/1 package/cegui: fix selecting the default OpenGL renderer
Quoted 4 lines · On Tue, 23 Jun 2020 21:19:07 +0200 Bartosz Bilas <[email protected]>…
According to the cegui requirements select explicit the default OpenGL renderer based on available possibilities.
Signed-off-by Bartosz Bilas <[email protected]>
Applied, with one change. See below.
package/cegui/cegui.mk CEGUI_DEPENDENCIES = glm \ · line 16
Quoted 6 lines
package/cegui/cegui.mk +0
-0@@ -16,15 +16,25 @@ CEGUI_DEPENDENCIES = glm \ $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
We have this here...
package/cegui/cegui.mk CEGUI_DEPENDENCIES = glm \ · line 19
Quoted 4 lines
package/cegui/cegui.mk +1
-1$(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ - $(if $(BR2_PACKAGE_LIBGLEW),libglew) \ + $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
and you're adding it again here. So I dropped this new addition.
I also made a few indentation fixes.
Thanks for your contribution!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com