package/cegui: fix selecting the default OpenGL renderer

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>

diff --git a/package/cegui/Config.in b/package/cegui/Config.in
index f917be0cc57e2b5951df83f93ffaa6cb4c9c282c..1bd0ee1cc339279cf4de03c76025d657a35513a9 100644 (file)
--- 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 6158ef129c4426a92cc607d9cb99fc9b3c3650ab..12b2712f33387e6f2dd8406f91c6f48f3483feab 100644 (file)
--- 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)