Rename the interface files and hopefully fix OSX building.

Source/Core/DolphinWX/Src/GLInterface.h

@@ -14,21 +14,21 @@
 
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
-#ifndef _VIDEOINTERFACE_H_
-#define _VIDEOINTERFACE_H_
+#ifndef _GLINTERFACE_H_
+#define _GLINTERFACE_H_
 
 #include "Thread.h"
 
 #if defined(USE_EGL) && USE_EGL
-#include "VideoInterface/EGL.h"
+#include "GLInterface/EGL.h"
 #elif defined(USE_WX) && USE_WX
-#include "VideoInterface/WX.h"
+#include "GLInterface/WX.h"
 #elif defined(__APPLE__)
-#include "VideoInterface/AGL.h"
+#include "GLInterface/AGL.h"
 #elif defined(_WIN32)
-#include "VideoInterface/WGL.h"
+#include "GLInterface/WGL.h"
 #elif defined(HAVE_X11) && HAVE_X11
-#include "VideoInterface/GLX.h"
+#include "GLInterface/GLX.h"
 #endif
 
 typedef struct {

Source/Core/DolphinWX/Src/GLInterface/AGL.cpp

@@ -20,7 +20,7 @@
 #include "RenderBase.h"
 
 #include "VertexShaderManager.h"
-#include "../GLVideoInterface.h"
+#include "../GLInterface.h"
 #include "AGL.h"
 
 void cInterfaceAGL::SwapBuffers()

Source/Core/DolphinWX/Src/GLInterface/EGL.cpp

@@ -20,7 +20,7 @@
 #include "RenderBase.h"
 
 #include "VertexShaderManager.h"
-#include "../GLVideoInterface.h"
+#include "../GLInterface.h"
 #include "EGL.h"
 
 void cInterfaceEGL::CreateXWindow(void)
@@ -294,7 +294,6 @@ bool cInterfaceEGL::CreateWindow(void *&window_handle)
 	if (GLWin.parent == 0)
 		GLWin.parent = RootWindow(GLWin.x_dpy, GLWin.screen);
 
-   unsigned long mask;
    XVisualInfo  visTemplate;
    int num_visuals;
    EGLConfig config;

Source/Core/DolphinWX/Src/GLInterface/GLX.cpp

@@ -20,7 +20,7 @@
 #include "RenderBase.h"
 
 #include "VertexShaderManager.h"
-#include "../GLVideoInterface.h"
+#include "../GLInterface.h"
 #include "GLX.h"
 
 void cInterfaceGLX::CreateXWindow(void)

Source/Core/DolphinWX/Src/GLInterface/WGL.cpp

@@ -20,7 +20,7 @@
 #include "RenderBase.h"
 
 #include "VertexShaderManager.h"
-#include "../GLVideoInterface.h"
+#include "../GLInterface.h"
 #include "WGL.h"
 
 #include "EmuWindow.h"

Source/Core/DolphinWX/Src/GLInterface/WX.cpp

@@ -20,7 +20,7 @@
 #include "RenderBase.h"
 
 #include "VertexShaderManager.h"
-#include "../GLVideoInterface.h"
+#include "../GLInterface.h"
 #include "WX.h"
 
 void cInterfaceWX::SwapBuffers()