From 6560019829f6e33c67f1f3ca69d5c4db2d2100dc Mon Sep 17 00:00:00 2001
From: Alexander Szpakowski <amaranth72@gmail.com>
Date: Tue, 1 Jan 2013 17:54:14 -0400
Subject: [PATCH] opengl graphics module files now always include OpenGL.h
 rather than GLee.h

---
 src/modules/graphics/opengl/Graphics.h         | 3 +--
 src/modules/graphics/opengl/Image.h            | 4 +---
 src/modules/graphics/opengl/OpenGL.h           | 4 ++--
 src/modules/graphics/opengl/ParticleSystem.cpp | 2 +-
 src/modules/graphics/opengl/Quad.cpp           | 4 ++--
 src/modules/graphics/opengl/ShaderEffect.cpp   | 1 -
 src/modules/graphics/opengl/SpriteBatch.cpp    | 3 +++
 src/modules/graphics/opengl/SpriteBatch.h      | 3 ---
 src/modules/graphics/opengl/VertexBuffer.h     | 2 +-
 src/modules/graphics/opengl/wrap_Graphics.cpp  | 2 +-
 10 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h
index e75a2d53a..ad4c9ff01 100644
--- a/src/modules/graphics/opengl/Graphics.h
+++ b/src/modules/graphics/opengl/Graphics.h
@@ -26,7 +26,7 @@
 #include <cmath>
 
 // OpenGL
-#include "GLee.h"
+#include "OpenGL.h"
 
 // LOVE
 #include "graphics/Graphics.h"
@@ -37,7 +37,6 @@
 
 #include "window/Window.h"
 
-#include "OpenGL.h"
 #include "Font.h"
 #include "Image.h"
 #include "Quad.h"
diff --git a/src/modules/graphics/opengl/Image.h b/src/modules/graphics/opengl/Image.h
index af7e9a9d9..6597d9f1e 100644
--- a/src/modules/graphics/opengl/Image.h
+++ b/src/modules/graphics/opengl/Image.h
@@ -28,10 +28,8 @@
 #include "image/ImageData.h"
 #include "graphics/Image.h"
 
-#include "OpenGL.h"
-
 // OpenGL
-#include "GLee.h"
+#include "OpenGL.h"
 
 namespace love
 {
diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h
index 9cd7ac73a..8b01941da 100644
--- a/src/modules/graphics/opengl/OpenGL.h
+++ b/src/modules/graphics/opengl/OpenGL.h
@@ -18,8 +18,8 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#ifndef LOVE_COMMON_OPENGL_H
-#define LOVE_COMMON_OPENGL_H
+#ifndef LOVE_GRAPHICS_OPENGL_OPENGL_H
+#define LOVE_GRAPHICS_OPENGL_OPENGL_H
 
 #include "GLee.h"
 
diff --git a/src/modules/graphics/opengl/ParticleSystem.cpp b/src/modules/graphics/opengl/ParticleSystem.cpp
index 167958dd7..d3ecf7e68 100644
--- a/src/modules/graphics/opengl/ParticleSystem.cpp
+++ b/src/modules/graphics/opengl/ParticleSystem.cpp
@@ -22,7 +22,7 @@
 
 #include "common/math.h"
 
-#include "GLee.h"
+#include "OpenGL.h"
 #include <cmath>
 #include <cstdlib>
 
diff --git a/src/modules/graphics/opengl/Quad.cpp b/src/modules/graphics/opengl/Quad.cpp
index 842fd64d1..a9eb193f7 100644
--- a/src/modules/graphics/opengl/Quad.cpp
+++ b/src/modules/graphics/opengl/Quad.cpp
@@ -21,8 +21,8 @@
 #include "Quad.h"
 #include "common/Matrix.h"
 
-// GLee
-#include "GLee.h"
+// OpenGL
+#include "OpenGL.h"
 
 // STD
 #include <cstring> // For memcpy
diff --git a/src/modules/graphics/opengl/ShaderEffect.cpp b/src/modules/graphics/opengl/ShaderEffect.cpp
index d3df7ac92..3e965a8aa 100644
--- a/src/modules/graphics/opengl/ShaderEffect.cpp
+++ b/src/modules/graphics/opengl/ShaderEffect.cpp
@@ -114,7 +114,6 @@ GLuint ShaderEffect::createShader(const ShaderSource &source)
 		shadertypename = "fragment";
 		break;
 	default:
-		// tesselation control and evaluation shaders aren't recognized by current version of GLee
 		throw love::Exception("Cannot create shader object: unknown shader type.");
 		break;
 	}
diff --git a/src/modules/graphics/opengl/SpriteBatch.cpp b/src/modules/graphics/opengl/SpriteBatch.cpp
index 0f2cace41..b46daf49c 100644
--- a/src/modules/graphics/opengl/SpriteBatch.cpp
+++ b/src/modules/graphics/opengl/SpriteBatch.cpp
@@ -23,6 +23,9 @@
 // STD
 #include <iostream>
 
+// OpenGL
+#include "OpenGL.h"
+
 // LOVE
 #include "Image.h"
 #include "Quad.h"
diff --git a/src/modules/graphics/opengl/SpriteBatch.h b/src/modules/graphics/opengl/SpriteBatch.h
index eae871ae2..c5b8b7ceb 100644
--- a/src/modules/graphics/opengl/SpriteBatch.h
+++ b/src/modules/graphics/opengl/SpriteBatch.h
@@ -34,9 +34,6 @@
 #include "graphics/Volatile.h"
 #include "graphics/Color.h"
 
-// OpenGL
-#include "GLee.h"
-
 namespace love
 {
 namespace graphics
diff --git a/src/modules/graphics/opengl/VertexBuffer.h b/src/modules/graphics/opengl/VertexBuffer.h
index af09f1b9f..df2fe097a 100644
--- a/src/modules/graphics/opengl/VertexBuffer.h
+++ b/src/modules/graphics/opengl/VertexBuffer.h
@@ -26,7 +26,7 @@
 #include "graphics/Volatile.h"
 
 // OpenGL
-#include "GLee.h"
+#include "OpenGL.h"
 
 namespace love
 {
diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp
index b55952824..297bfc150 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.cpp
+++ b/src/modules/graphics/opengl/wrap_Graphics.cpp
@@ -19,7 +19,7 @@
  **/
 
 #include "wrap_Graphics.h"
-#include "GLee.h"
+#include "OpenGL.h"
 #include "graphics/DrawQable.h"
 #include "image/ImageData.h"
 #include "font/Rasterizer.h"