Convert all includes to relative paths.

2025-07-30 01:29:42 -06:00 · 2014-02-17 05:18:15 -05:00
parent 73691a8587
commit 2afe215271
893 changed files with 4628 additions and 4957 deletions
--- a/Source/Core/DolphinWX/GLInterface/AGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp
@ -2,16 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VideoConfig.h"
-#include "Host.h"
-#include "RenderBase.h"
-#include "ConfigManager.h"
-
 #include <wx/panel.h>

-#include "VertexShaderManager.h"
-#include "GLInterface.h"
-#include "AGL.h"
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/AGL.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"

 void cInterfaceAGL::Swap()
 {
--- a/Source/Core/DolphinWX/GLInterface/AGL.h
+++ b/Source/Core/DolphinWX/GLInterface/AGL.h
@ -8,7 +8,7 @@
 #import <AppKit/AppKit.h>
 #endif

-#include "InterfaceBase.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"

 class cInterfaceAGL : public cInterfaceBase
 {
--- a/Source/Core/DolphinWX/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp
@ -1,25 +1,11 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.

-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "RenderBase.h"
-
-#include "GLInterface.h"
-#include "EGL.h"
+#include "Core/Host.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/EGL.h"
+#include "VideoCommon/RenderBase.h"

 // Show the current FPS
 void cInterfaceEGL::UpdateFPSDisplay(const char *text)
--- a/Source/Core/DolphinWX/GLInterface/EGL.h
+++ b/Source/Core/DolphinWX/GLInterface/EGL.h
@ -5,8 +5,9 @@
 #pragma once

 #include <EGL/egl.h>
-#include "InterfaceBase.h"
-#include "ConfigManager.h"
+
+#include "Core/ConfigManager.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"


 class cPlatform
--- a/Source/Core/DolphinWX/GLInterface/GLInterface.h
+++ b/Source/Core/DolphinWX/GLInterface/GLInterface.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Thread.h"
+#include "Common/Thread.h"

 #if USE_EGL
 // Currently Wayland/EGL and X11/EGL platforms are supported.
@ -19,19 +19,19 @@ enum egl_platform {
 };

 #if HAVE_X11
-#include "GLInterface/X11_Util.h"
+#include "DolphinWX/GLInterface/X11_Util.h"
 #endif
 #if HAVE_WAYLAND
-#include "GLInterface/Wayland_Util.h"
+#include "DolphinWX/GLInterface/Wayland_Util.h"
 #endif

-#include "GLInterface/EGL.h"
+#include "DolphinWX/GLInterface/EGL.h"
 #elif defined(__APPLE__)
-#include "GLInterface/AGL.h"
+#include "DolphinWX/GLInterface/AGL.h"
 #elif defined(_WIN32)
-#include "GLInterface/WGL.h"
+#include "DolphinWX/GLInterface/WGL.h"
 #elif HAVE_X11
-#include "GLInterface/GLX.h"
+#include "DolphinWX/GLInterface/GLX.h"
 #include <GL/glx.h>
 #else
 #error Platform doesnt have a GLInterface
--- a/Source/Core/DolphinWX/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp
@ -2,12 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Host.h"
-#include "RenderBase.h"
-#include "VideoConfig.h"
+#include "Core/Host.h"

-#include "GLInterface.h"
-#include "GLX.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/GLX.h"
+
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoConfig.h"

 typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
 PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = NULL;
--- a/Source/Core/DolphinWX/GLInterface/GLX.h
+++ b/Source/Core/DolphinWX/GLInterface/GLX.h
@ -4,8 +4,8 @@

 #pragma once

-#include "X11_Util.h"
-#include "InterfaceBase.h"
+#include "DolphinWX/GLInterface/X11_Util.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"

 class cInterfaceGLX : public cInterfaceBase
 {
--- a/Source/Core/DolphinWX/GLInterface/InterfaceBase.h
+++ b/Source/Core/DolphinWX/GLInterface/InterfaceBase.h
@ -4,6 +4,8 @@

 #pragma once

+#include "Common/Common.h"
+
 enum GLInterfaceMode {
 	MODE_DETECT = 0,
 	MODE_OPENGL,
--- a/Source/Core/DolphinWX/GLInterface/Platform.cpp
+++ b/Source/Core/DolphinWX/GLInterface/Platform.cpp
@ -1,22 +1,9 @@
-// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.

-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "GLInterface/GLInterface.h"
+#include "Core/Host.h"
+#include "DolphinWX/GLInterface/GLInterface.h"

 bool cPlatform::SelectDisplay(void)
 {
--- a/Source/Core/DolphinWX/GLInterface/WGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp
@ -2,15 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VideoConfig.h"
-#include "Host.h"
-#include "RenderBase.h"
+#include "Core/Host.h"

-#include "VertexShaderManager.h"
-#include "GLInterface.h"
-#include "WGL.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/WGL.h"
+
+#include "VideoCommon/EmuWindow.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"

-#include "EmuWindow.h"
 static HDC hDC = NULL;       // Private GDI Device Context
 static HGLRC hRC = NULL;     // Permanent Rendering Context
 static HINSTANCE dllHandle = NULL; // Handle to OpenGL32.dll 
--- a/Source/Core/DolphinWX/GLInterface/WGL.h
+++ b/Source/Core/DolphinWX/GLInterface/WGL.h
@ -4,7 +4,7 @@

 #pragma once

-#include "InterfaceBase.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"

 class cInterfaceWGL : public cInterfaceBase
 {
--- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
+++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
@ -2,12 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Core.h"
-#include "State.h"
-#include "GLInterface.h"
 #include <linux/input.h>
 #include <sys/mman.h>

+#include "Core/Core.h"
+#include "Core/State.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+
 static void
 hide_cursor(void)
 {
--- a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp
@ -1,23 +1,10 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.

-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "VideoConfig.h"
-#include "GLInterface.h"
+#include "Core/Host.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "VideoCommon/VideoConfig.h"

 #if USE_EGL
 bool cXInterface::ServerConnect(void)