From a90844f0dd30082f6ccf314cc63a47cab9209942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Sat, 29 May 2021 00:52:10 +0200
Subject: [PATCH] Remove X11 dependency properly (as it's handled by SDL and
 EGL)

---
 .../OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp  |  3 ---
 .../OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp  | 13 -------------
 xmake.lua                                           |  4 +---
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp
index 7949514be..9695d5371 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp
@@ -25,9 +25,6 @@ namespace Nz::GL
 
 			EGLContextX11& operator=(const EGLContextX11&) = delete;
 			EGLContextX11& operator=(EGLContextX11&&) = delete;
-
-		private:
-			::Display* m_xdisplay = nullptr;
 	};
 }
 
diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp
index ae4a9064f..2343f61a4 100644
--- a/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp
@@ -10,8 +10,6 @@ namespace Nz::GL
 {
 	bool EGLContextX11::Create(const ContextParams& params, WindowHandle window, const EGLContextBase* shareContext)
 	{
-		//TODO: Load X11 dynamically
-
 		assert(window.type == WindowManager::X11);
 
 		Destroy(); //< In case a previous display or surface hasn't been released
@@ -40,15 +38,4 @@ namespace Nz::GL
 
 		return CreateInternal(configs[configIndex], shareContext);
 	}
-
-	void EGLContextX11::Destroy()
-	{
-		EGLContextBase::Destroy();
-
-		if (m_xdisplay)
-		{
-			XCloseDisplay(m_xdisplay);
-			m_xdisplay = nullptr;
-		}
-	}
 }
diff --git a/xmake.lua b/xmake.lua
index b0f414ea9..769bb3da7 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -30,9 +30,7 @@ local modules = {
 				del_files("src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp")
 			end
 
-			if is_plat("linux") then
-				add_syslinks("x11") -- FIXME
-			else
+			if not is_plat("linux") then
 				del_files("src/Nazara/OpenGLRenderer/Wrapper/Linux/**.cpp")
 			end
 		end