sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove X11 dependency properly (as it's handled by SDL and EGL)

This commit is contained in:
Jérôme Leclercq 2021-05-29 00:52:10 +02:00
parent 41baacd9ab
commit a90844f0dd
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp
View File

@ -25,9 +25,6 @@ namespace Nz::GL
EGLContextX11& operator=(const EGLContextX11&) = delete; EGLContextX11& operator=(const EGLContextX11&) = delete;
EGLContextX11& operator=(EGLContextX11&&) = delete; EGLContextX11& operator=(EGLContextX11&&) = delete;
private:
::Display* m_xdisplay = nullptr;
}; };
} }

13
src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp
View File

@ -10,8 +10,6 @@ namespace Nz::GL
{ {
bool EGLContextX11::Create(const ContextParams& params, WindowHandle window, const EGLContextBase* shareContext) bool EGLContextX11::Create(const ContextParams& params, WindowHandle window, const EGLContextBase* shareContext)
{ {
//TODO: Load X11 dynamically
assert(window.type == WindowManager::X11); assert(window.type == WindowManager::X11);
Destroy(); //< In case a previous display or surface hasn't been released Destroy(); //< In case a previous display or surface hasn't been released
@ -40,15 +38,4 @@ namespace Nz::GL
return CreateInternal(configs[configIndex], shareContext); return CreateInternal(configs[configIndex], shareContext);
} }
void EGLContextX11::Destroy()
{
EGLContextBase::Destroy();
if (m_xdisplay)
{
XCloseDisplay(m_xdisplay);
m_xdisplay = nullptr;
}
}
} }

4
xmake.lua
View File

@ -30,9 +30,7 @@ local modules = {
del_files("src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp") del_files("src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp")
end end
if is_plat("linux") then if not is_plat("linux") then
add_syslinks("x11") -- FIXME
else
del_files("src/Nazara/OpenGLRenderer/Wrapper/Linux/**.cpp") del_files("src/Nazara/OpenGLRenderer/Wrapper/Linux/**.cpp")
end end
end end