From 2c8340e1dc3b05d7f314c363ebc9278f40eb5350 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 20 Jan 2014 00:46:21 -0700
Subject: [PATCH] Move GLInterface.h into GLInterface directory

---
 Source/Core/DolphinWX/Android/ButtonManager.cpp                 | 2 +-
 Source/Core/DolphinWX/GLInterface/AGL.cpp                       | 2 +-
 Source/Core/DolphinWX/GLInterface/EGL.cpp                       | 2 +-
 Source/Core/DolphinWX/{ => GLInterface}/GLInterface.h           | 0
 Source/Core/DolphinWX/GLInterface/GLX.cpp                       | 2 +-
 Source/Core/DolphinWX/GLInterface/Platform.cpp                  | 2 +-
 Source/Core/DolphinWX/GLInterface/WGL.cpp                       | 2 +-
 Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp              | 2 +-
 Source/Core/DolphinWX/GLInterface/X11_Util.cpp                  | 2 +-
 Source/Core/DolphinWX/MainNoGUI.cpp                             | 2 +-
 .../InputCommon/ControllerInterface/ControllerInterface.cpp     | 2 +-
 Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h       | 2 +-
 Source/Core/VideoBackends/OGL/GLUtil.h                          | 2 +-
 Source/Core/VideoBackends/OGL/PerfQuery.cpp                     | 2 +-
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename Source/Core/DolphinWX/{ => GLInterface}/GLInterface.h (100%)

diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index ceabbb581c..f451d64412 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include <unordered_map>
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 #include "Android/ButtonManager.h"
 
 namespace ButtonManager
diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp
index 1068e870a0..a3845d4137 100644
--- a/Source/Core/DolphinWX/GLInterface/AGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp
@@ -23,7 +23,7 @@
 #include <wx/panel.h>
 
 #include "VertexShaderManager.h"
-#include "../GLInterface.h"
+#include "GLInterface.h"
 #include "AGL.h"
 
 void cInterfaceAGL::Swap()
diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp
index 1b6b38f593..627d2a8402 100644
--- a/Source/Core/DolphinWX/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp
@@ -18,7 +18,7 @@
 #include "Host.h"
 #include "RenderBase.h"
 
-#include "../GLInterface.h"
+#include "GLInterface.h"
 #include "EGL.h"
 
 // Show the current FPS
diff --git a/Source/Core/DolphinWX/GLInterface.h b/Source/Core/DolphinWX/GLInterface/GLInterface.h
similarity index 100%
rename from Source/Core/DolphinWX/GLInterface.h
rename to Source/Core/DolphinWX/GLInterface/GLInterface.h
diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp
index 8b6010f08e..47ae9ece94 100644
--- a/Source/Core/DolphinWX/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp
@@ -19,7 +19,7 @@
 #include "RenderBase.h"
 #include "VideoConfig.h"
 
-#include "../GLInterface.h"
+#include "GLInterface.h"
 #include "GLX.h"
 
 typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
diff --git a/Source/Core/DolphinWX/GLInterface/Platform.cpp b/Source/Core/DolphinWX/GLInterface/Platform.cpp
index 57a6c54a1c..9874b6702c 100644
--- a/Source/Core/DolphinWX/GLInterface/Platform.cpp
+++ b/Source/Core/DolphinWX/GLInterface/Platform.cpp
@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Host.h"
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 
 bool cPlatform::SelectDisplay(void)
 {
diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp
index 74c6956371..6587a22d81 100644
--- a/Source/Core/DolphinWX/GLInterface/WGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp
@@ -7,7 +7,7 @@
 #include "RenderBase.h"
 
 #include "VertexShaderManager.h"
-#include "../GLInterface.h"
+#include "GLInterface.h"
 #include "WGL.h"
 
 #include "EmuWindow.h"
diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
index 21b1bad4f5..3f6475e4ef 100644
--- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
+++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
@@ -17,7 +17,7 @@
 
 #include "Core.h"
 #include "State.h"
-#include "../GLInterface.h"
+#include "GLInterface.h"
 #include <linux/input.h>
 #include <sys/mman.h>
 
diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp
index fe7bc66f8e..e17fd05eaf 100644
--- a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp
@@ -17,7 +17,7 @@
 
 #include "Host.h"
 #include "VideoConfig.h"
-#include "../GLInterface.h"
+#include "GLInterface.h"
 
 #if USE_EGL
 bool cXInterface::ServerConnect(void)
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index ee10bd87b4..be794cce4e 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -18,7 +18,7 @@
 
 #if HAVE_WAYLAND
 #include <wayland-client.h>
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 #endif
 
 #ifdef __APPLE__
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index ab99273c31..66a7b1e56c 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -1,7 +1,7 @@
 #include "ControllerInterface.h"
 
 #if USE_EGL
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 #endif
 
 #ifdef CIFACE_USE_XINPUT
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
index 52bb1fd4dd..caf88efd94 100644
--- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 
 #include "gl_1_1.h"
 #include "gl_1_2.h"
diff --git a/Source/Core/VideoBackends/OGL/GLUtil.h b/Source/Core/VideoBackends/OGL/GLUtil.h
index f162b76b0e..2939821784 100644
--- a/Source/Core/VideoBackends/OGL/GLUtil.h
+++ b/Source/Core/VideoBackends/OGL/GLUtil.h
@@ -7,7 +7,7 @@
 
 #include "VideoConfig.h"
 #include "MathUtil.h"
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 #include "GLExtensions/GLExtensions.h"
 
 #ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/PerfQuery.cpp
index c1c5eda36d..0dd97d95cb 100644
--- a/Source/Core/VideoBackends/OGL/PerfQuery.cpp
+++ b/Source/Core/VideoBackends/OGL/PerfQuery.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "GLInterface.h"
+#include "GLInterface/GLInterface.h"
 #include "RenderBase.h"
 #include "GLUtil.h"
 #include "PerfQuery.h"