From patchwork Tue Jun 23 19:19:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1315438 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49rx0j5V14z9sPF for ; Wed, 24 Jun 2020 05:19:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 523348775C; Tue, 23 Jun 2020 19:19:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yXji8uaoadAC; Tue, 23 Jun 2020 19:19:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EBC3287771; Tue, 23 Jun 2020 19:19:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 08A681BF30A for ; Tue, 23 Jun 2020 19:19:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D67E587DDC for ; Tue, 23 Jun 2020 19:19:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d1Kzo2lu1HPv for ; Tue, 23 Jun 2020 19:19:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.megiteam.pl (smtp.megiteam.pl [31.186.83.105]) by whitealder.osuosl.org (Postfix) with ESMTPS id 80D7487E3E for ; Tue, 23 Jun 2020 19:19:12 +0000 (UTC) Received: from host-81-161-202-55.oxylion.net.pl ([81.161.202.55] helo=bartekk-pc.lan) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1jnoRq-0003IU-2i; Tue, 23 Jun 2020 21:19:10 +0200 From: Bartosz Bilas To: buildroot@buildroot.org Date: Tue, 23 Jun 2020 21:19:07 +0200 Message-Id: <20200623191907.385318-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/cegui: fix selecting the default OpenGL renderer X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" According to the cegui requirements select explicit the default OpenGL renderer based on available possibilities. Signed-off-by: Bartosz Bilas --- package/cegui/Config.in | 1 + package/cegui/cegui.mk | 18 ++++++++++++++---- 2 files changed, 15 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..505d67656a 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -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)