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

Rename WGL folder from Win32 to WGL

This commit is contained in:
Jérôme Leclercq 2020-08-28 15:52:31 +02:00
parent 8d873a8307
commit ea8f34c45e
10 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/scripts/tools/openglrenderer.lua
View File

@ -33,6 +33,8 @@ TOOL.Libraries = {
}
TOOL.OsFiles.Windows = {
"../src/Nazara/OpenGLRenderer/Win32/**.hpp",
"../src/Nazara/OpenGLRenderer/Win32/**.cpp"
"../include/Nazara/OpenGLRenderer/Wrapper/WGL/**.hpp",
"../include/Nazara/OpenGLRenderer/Wrapper/WGL/**.inl",
"../src/Nazara/OpenGLRenderer/Wrapper/WGL/**.hpp",
"../src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp"
}

6
include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp → include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
View File

@ -11,13 +11,13 @@
#include <Nazara/Core/DynLib.hpp>
#include <Nazara/Platform/WindowHandle.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/Win32Helper.hpp>
#include <string>
#include <type_traits>
#include <unordered_set>
#undef WIN32_LEAN_AND_MEAN //< Redefined by OpenGL header (ty Khronos)
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp>
namespace Nz::GL
{
@ -80,6 +80,6 @@ namespace Nz::GL
};
}
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.inl>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.inl>
#endif

2
include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.inl → include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.inl
View File

@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - OpenGL Renderer"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
#include <Nazara/OpenGLRenderer/Debug.hpp>
namespace Nz::GL

0
include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp → include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp
View File

6
include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp → include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp
View File

@ -10,11 +10,11 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/DynLib.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
#include <string>
#undef WIN32_LEAN_AND_MEAN //< Redefined by OpenGL header (ty Khronos)
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp>
namespace Nz::GL
{
@ -47,6 +47,6 @@ namespace Nz::GL
};
}
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.inl>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.inl>
#endif

2
include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.inl → include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.inl
View File

@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - OpenGL Renderer"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
#include <Nazara/OpenGLRenderer/Debug.hpp>
namespace Nz::Vk

0
include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp → include/Nazara/OpenGLRenderer/Wrapper/WGL/Win32Helper.hpp
View File

2
src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
View File

@ -13,7 +13,7 @@
#include <sstream>
#ifdef NAZARA_PLATFORM_WINDOWS
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
#endif
#include <Nazara/OpenGLRenderer/Debug.hpp>

4
src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.cpp → src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp
View File

@ -2,10 +2,10 @@
// This file is part of the "Nazara Engine - OpenGL Renderer"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
#include <array>
#include <cassert>
#include <Nazara/OpenGLRenderer/Debug.hpp>

4
src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.cpp → src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.cpp
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine - OpenGL Renderer"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
#include <Nazara/OpenGLRenderer/Debug.hpp>
namespace Nz::GL