From 5343b581ad3e41570f4d7ad515b84887136a4d9e Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 13 Feb 2019 01:05:07 +0100
Subject: [PATCH] Warnings: fix opengl redefined name (#196)

* opengl: use official include names

* thirdparty: rename GL3 into GL
---
 include/Nazara/Renderer/OpenGL.hpp         | 10 ++++++----
 thirdparty/include/{GL3 => GL}/glcorearb.h |  0
 thirdparty/include/{GL3 => GL}/glext.h     |  0
 thirdparty/include/{GL3 => GL}/glxext.h    |  0
 thirdparty/include/{GL3 => GL}/wglext.h    |  0
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename thirdparty/include/{GL3 => GL}/glcorearb.h (100%)
 rename thirdparty/include/{GL3 => GL}/glext.h (100%)
 rename thirdparty/include/{GL3 => GL}/glxext.h (100%)
 rename thirdparty/include/{GL3 => GL}/wglext.h (100%)

diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp
index c87426f12..77fe10ad3 100644
--- a/include/Nazara/Renderer/OpenGL.hpp
+++ b/include/Nazara/Renderer/OpenGL.hpp
@@ -17,16 +17,18 @@
 #include <Nazara/Utility/Enums.hpp>
 
 // 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)
-	#include <GL3/wglext.h>
+	#include <GL/wglext.h>
 #elif defined(NAZARA_PLATFORM_GLX)
 namespace GLX
 {
 	#include <GL/glx.h> // Defined in a namespace to avoid conflict
 }
-	#include <GL3/glxext.h>
+	#include <GL/glxext.h>
 #endif
 
 namespace Nz
diff --git a/thirdparty/include/GL3/glcorearb.h b/thirdparty/include/GL/glcorearb.h
similarity index 100%
rename from thirdparty/include/GL3/glcorearb.h
rename to thirdparty/include/GL/glcorearb.h
diff --git a/thirdparty/include/GL3/glext.h b/thirdparty/include/GL/glext.h
similarity index 100%
rename from thirdparty/include/GL3/glext.h
rename to thirdparty/include/GL/glext.h
diff --git a/thirdparty/include/GL3/glxext.h b/thirdparty/include/GL/glxext.h
similarity index 100%
rename from thirdparty/include/GL3/glxext.h
rename to thirdparty/include/GL/glxext.h
diff --git a/thirdparty/include/GL3/wglext.h b/thirdparty/include/GL/wglext.h
similarity index 100%
rename from thirdparty/include/GL3/wglext.h
rename to thirdparty/include/GL/wglext.h