From 8b4a50a3fee0bd13dd8574d8cbfc34f546b9fd24 Mon Sep 17 00:00:00 2001 From: ningit Date: Wed, 6 Oct 2021 15:23:01 +0200 Subject: [PATCH 1/2] Fix build issue with libglvnd 1.3.4 --- CMake/Dependencies.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index 8f9dbf61319..5ebb69bb4e8 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -180,6 +180,7 @@ macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.f if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN) find_package(X11) macro_log_feature(X11_FOUND "X11" "X Window system" "http://www.x.org" TRUE "" "") + add_compile_definitions(USE_X11) endif () From 31ff80eb1aae8fb8c942fc45b5ec9743de6b7e1d Mon Sep 17 00:00:00 2001 From: ningit Date: Wed, 6 Oct 2021 18:33:05 +0200 Subject: [PATCH 2/2] Limit the scope of the USE_X11 macro definition --- CMake/Dependencies.cmake | 1 - RenderSystems/GLSupport/include/EGL/X11/OgreX11EGLSupport.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index 5ebb69bb4e8..8f9dbf61319 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -180,7 +180,6 @@ macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.f if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN) find_package(X11) macro_log_feature(X11_FOUND "X11" "X Window system" "http://www.x.org" TRUE "" "") - add_compile_definitions(USE_X11) endif () diff --git a/RenderSystems/GLSupport/include/EGL/X11/OgreX11EGLSupport.h b/RenderSystems/GLSupport/include/EGL/X11/OgreX11EGLSupport.h index 5540b8d59cc..825335ee058 100644 --- a/RenderSystems/GLSupport/include/EGL/X11/OgreX11EGLSupport.h +++ b/RenderSystems/GLSupport/include/EGL/X11/OgreX11EGLSupport.h @@ -30,6 +30,8 @@ THE SOFTWARE. #ifndef __X11EGLSupport_H__ #define __X11EGLSupport_H__ +// Tell EGL that we are using X11 (to select the appropriate definitions) +#define USE_X11 #include "OgreEGLSupport.h"