Rename the interface files and hopefully fix OSX building.

CMakeLists.txt

@@ -178,6 +178,10 @@ if(APPLE)
 	# page on x86_64 is 4GB in size.
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
 
+	if(NOT DISABLE_WX)
+		add_definitions(-DUSE_WX -DHAVE_WX)
+		set(USE_WX TRUE)
+	endif()
 	find_library(APPKIT_LIBRARY AppKit)
 	find_library(APPSERV_LIBRARY ApplicationServices)
 	find_library(ATB_LIBRARY AudioToolbox)

Source/Core/Common/Src/Common.h

@@ -60,11 +60,6 @@ private:
 #undef STACKALIGN
 #define STACKALIGN __attribute__((__force_align_arg_pointer__))
 #endif
-// We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support.
-#ifdef __WXOSX_COCOA__
-#define HAVE_WX 1
-#define USE_WX 1	// Use wxGLCanvas
-#endif
 
 #elif defined _WIN32
 

Source/Core/DolphinWX/CMakeLists.txt

@@ -85,20 +85,26 @@ endif()
 
 if(USE_EGL)
 	set(SRCS ${SRCS}
-		Src/VideoInterface/EGL.cpp
+		Src/GLInterface/EGL.cpp
 	)
 else()
 	if(WIN32)
 		set(SRCS ${SRCS}
-			Src/VideoInterface/GLW.cpp
+			Src/GLInterface/GLW.cpp
 		)
 	elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		set(SRCS ${SRCS}
+		if(USE_WX)
-			Src/VideoInterface/AGL.cpp
+			set(SRCS ${SRCS}
-		)
+				Src/GLInterface/WX.cpp
+			)
+		else()	
+			set(SRCS ${SRCS}
+				Src/GLInterface/AGL.cpp
+			)
+		endif()
 	else()
 		set(SRCS ${SRCS}
-			Src/VideoInterface/GLX.cpp
+			Src/GLInterface/GLX.cpp
 		)
 	endif()
 endif()

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_
+#ifndef _GLINTERFACE_H_
-#define _VIDEOINTERFACE_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()

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h

@@ -20,7 +20,7 @@
 
 #include "VideoConfig.h"
 #include "MathUtil.h"
-#include "GLVideoInterface.h"
+#include "GLInterface.h"
 
 #ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils
 #define GL_DEPTH_STENCIL_EXT 0x84F9