From c1a934f7ed260ffb0ce78d30692275736df79cfd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 14:09:06 -0500 Subject: [PATCH] Fix the Android build. Required the removal of EGL.h from EGL.cpp. Removed the similar includes from AGL.cpp, GLX.cpp, and WGL.cpp to retain consistency. All GL interfaces are now centralized on GLInterface.h --- Source/Core/DolphinWX/GLInterface/AGL.cpp | 1 - Source/Core/DolphinWX/GLInterface/EGL.cpp | 1 - Source/Core/DolphinWX/GLInterface/GLX.cpp | 1 - Source/Core/DolphinWX/GLInterface/WGL.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index b8e157d819..09724de80c 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -7,7 +7,6 @@ #include "Core/ConfigManager.h" #include "Core/Host.h" -#include "DolphinWX/GLInterface/AGL.h" #include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index 1e75df1c80..6a25aa4411 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "Core/Host.h" -#include "DolphinWX/GLInterface/EGL.h" #include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp index 04ac37086a..ea220d8876 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -5,7 +5,6 @@ #include "Core/Host.h" #include "DolphinWX/GLInterface/GLInterface.h" -#include "DolphinWX/GLInterface/GLX.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp index 15b9e41c2c..5de1468113 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp @@ -5,7 +5,6 @@ #include "Core/Host.h" #include "DolphinWX/GLInterface/GLInterface.h" -#include "DolphinWX/GLInterface/WGL.h" #include "VideoCommon/EmuWindow.h" #include "VideoCommon/RenderBase.h"