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

Warnings: fix opengl redefined name (#196) 

* opengl: use official include names

* thirdparty: rename GL3 into GL
This commit is contained in:
Alexandre Janniaux 2019-02-13 01:05:07 +01:00 committed by Jérôme Leclercq
parent b002a054df
commit 5343b581ad
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Renderer/OpenGL.hpp
View File

@ -17,16 +17,18 @@
#include <Nazara/Utility/Enums.hpp> #include <Nazara/Utility/Enums.hpp>
// Inclusion des headers OpenGL // Inclusion des headers OpenGL
#include <GL3/glcorearb.h>
#include <GL3/glext.h> #include <GL/glcorearb.h>
#include <GL/glext.h>
#if defined(NAZARA_PLATFORM_WINDOWS) #if defined(NAZARA_PLATFORM_WINDOWS)
#include <GL3/wglext.h> #include <GL/wglext.h>
#elif defined(NAZARA_PLATFORM_GLX) #elif defined(NAZARA_PLATFORM_GLX)
namespace GLX namespace GLX
{ {
#include <GL/glx.h> // Defined in a namespace to avoid conflict #include <GL/glx.h> // Defined in a namespace to avoid conflict
} }
#include <GL3/glxext.h> #include <GL/glxext.h>
#endif #endif
namespace Nz namespace Nz

0
thirdparty/include/GL3/glcorearb.h → thirdparty/include/GL/glcorearb.h vendored
View File

0
thirdparty/include/GL3/glext.h → thirdparty/include/GL/glext.h vendored
View File

0
thirdparty/include/GL3/glxext.h → thirdparty/include/GL/glxext.h vendored
View File

0
thirdparty/include/GL3/wglext.h → thirdparty/include/GL/wglext.h vendored
View File