Remove unnecessary Src/ folders

Source/Core/DolphinWX/AboutDolphin.cpp

@@ -5,7 +5,7 @@
 #include "Common.h"
 #include "AboutDolphin.h"
 #include "WxUtils.h"
-#include "../resources/dolphin_logo.cpp"
+#include "resources/dolphin_logo.cpp"
 
 AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
 		const wxString &title, const wxPoint &position,

Source/Core/DolphinWX/CMakeLists.txt

@@ -52,85 +52,85 @@ endif()
 
 if(wxWidgets_FOUND)
 	set(SRCS 
-				Src/ARCodeAddEdit.cpp
-				Src/AboutDolphin.cpp
-				Src/CheatsWindow.cpp
-				Src/ConfigMain.cpp
-				Src/Debugger/BreakpointDlg.cpp
-				Src/Debugger/BreakpointView.cpp
-				Src/Debugger/BreakpointWindow.cpp
-				Src/Debugger/CodeView.cpp
-				Src/Debugger/CodeWindow.cpp
-				Src/Debugger/CodeWindowFunctions.cpp
-				Src/Debugger/DSPDebugWindow.cpp
-				Src/Debugger/DSPRegisterView.cpp
-				Src/Debugger/DebuggerPanel.cpp
-				Src/Debugger/DebuggerUIUtil.cpp
-				Src/Debugger/JitWindow.cpp
-				Src/Debugger/MemoryCheckDlg.cpp
-				Src/Debugger/MemoryView.cpp
-				Src/Debugger/MemoryWindow.cpp
-				Src/Debugger/RegisterView.cpp
-				Src/Debugger/RegisterWindow.cpp
-				Src/FifoPlayerDlg.cpp
-				Src/Frame.cpp
-				Src/FrameAui.cpp
-				Src/FrameTools.cpp
-				Src/GameListCtrl.cpp
-				Src/GeckoCodeDiag.cpp
-				Src/HotkeyDlg.cpp
-				Src/ISOFile.cpp
-				Src/ISOProperties.cpp
-				Src/InputConfigDiag.cpp
-				Src/InputConfigDiagBitmaps.cpp
-				Src/LogConfigWindow.cpp
-				Src/LogWindow.cpp
-				Src/Main.cpp
-				Src/MemcardManager.cpp
-				Src/MemoryCards/WiiSaveCrypted.cpp
-				Src/NetWindow.cpp
-				Src/PHackSettings.cpp
-				Src/PatchAddEdit.cpp
-				Src/TASInputDlg.cpp
-				Src/UDPConfigDiag.cpp
-				Src/VideoConfigDiag.cpp
-				Src/WXInputBase.cpp
-				Src/WiimoteConfigDiag.cpp
-				Src/WxUtils.cpp)
+				ARCodeAddEdit.cpp
+				AboutDolphin.cpp
+				CheatsWindow.cpp
+				ConfigMain.cpp
+				Debugger/BreakpointDlg.cpp
+				Debugger/BreakpointView.cpp
+				Debugger/BreakpointWindow.cpp
+				Debugger/CodeView.cpp
+				Debugger/CodeWindow.cpp
+				Debugger/CodeWindowFunctions.cpp
+				Debugger/DSPDebugWindow.cpp
+				Debugger/DSPRegisterView.cpp
+				Debugger/DebuggerPanel.cpp
+				Debugger/DebuggerUIUtil.cpp
+				Debugger/JitWindow.cpp
+				Debugger/MemoryCheckDlg.cpp
+				Debugger/MemoryView.cpp
+				Debugger/MemoryWindow.cpp
+				Debugger/RegisterView.cpp
+				Debugger/RegisterWindow.cpp
+				FifoPlayerDlg.cpp
+				Frame.cpp
+				FrameAui.cpp
+				FrameTools.cpp
+				GameListCtrl.cpp
+				GeckoCodeDiag.cpp
+				HotkeyDlg.cpp
+				ISOFile.cpp
+				ISOProperties.cpp
+				InputConfigDiag.cpp
+				InputConfigDiagBitmaps.cpp
+				LogConfigWindow.cpp
+				LogWindow.cpp
+				Main.cpp
+				MemcardManager.cpp
+				MemoryCards/WiiSaveCrypted.cpp
+				NetWindow.cpp
+				PHackSettings.cpp
+				PatchAddEdit.cpp
+				TASInputDlg.cpp
+				UDPConfigDiag.cpp
+				VideoConfigDiag.cpp
+				WXInputBase.cpp
+				WiimoteConfigDiag.cpp
+				WxUtils.cpp)
 
 	set(WXLIBS ${wxWidgets_LIBRARIES} dl)
 else()
 	if(ANDROID)
-		set(SRCS Src/Android/ButtonManager.cpp
-			 Src/MainAndroid.cpp)
+		set(SRCS Android/ButtonManager.cpp
+			 MainAndroid.cpp)
 	else()
-		set(SRCS Src/MainNoGUI.cpp)
+		set(SRCS MainNoGUI.cpp)
 	endif()
 endif()
 
 if(USE_EGL)
-	set(SRCS ${SRCS} Src/GLInterface/Platform.cpp
-		Src/GLInterface/EGL.cpp)	
+	set(SRCS ${SRCS} GLInterface/Platform.cpp
+		GLInterface/EGL.cpp)	
 	if(USE_WAYLAND)
-		set(SRCS ${SRCS} Src/GLInterface/Wayland_Util.cpp)
+		set(SRCS ${SRCS} GLInterface/Wayland_Util.cpp)
 	endif()
 	if(USE_X11)
-		set(SRCS ${SRCS} Src/GLInterface/X11_Util.cpp)
+		set(SRCS ${SRCS} GLInterface/X11_Util.cpp)
 	endif()
 else()
 	if(WIN32)
-		set(SRCS ${SRCS} Src/GLInterface/WGL.cpp)
+		set(SRCS ${SRCS} GLInterface/WGL.cpp)
 	elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		set(SRCS ${SRCS} Src/GLInterface/AGL.cpp)
+		set(SRCS ${SRCS} GLInterface/AGL.cpp)
 	else()
-		set(SRCS ${SRCS} Src/GLInterface/GLX.cpp
-			Src/GLInterface/X11_Util.cpp)
+		set(SRCS ${SRCS} GLInterface/GLX.cpp
+			GLInterface/X11_Util.cpp)
 
 	endif()
 endif()
 
 if(WIN32)
-	set(SRCS ${SRCS} Src/stdafx.cpp)
+	set(SRCS ${SRCS} stdafx.cpp)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	# Link against OS X system frameworks.
 	list(APPEND LIBS
@@ -154,7 +154,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set_source_files_properties(${RESOURCES} PROPERTIES
 		MACOSX_PACKAGE_LOCATION Resources)
 elseif(USE_X11)
-	set(SRCS ${SRCS} Src/X11Utils.cpp)
+	set(SRCS ${SRCS} X11Utils.cpp)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR

Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp

@@ -12,9 +12,9 @@
 #include "FileUtil.h"
 
 extern "C" {
-#include "../../resources/toolbar_add_breakpoint.c"
-#include "../../resources/toolbar_add_memorycheck.c"
-#include "../../resources/toolbar_debugger_delete.c"
+#include "../resources/toolbar_add_breakpoint.c"
+#include "../resources/toolbar_add_memorycheck.c"
+#include "../resources/toolbar_debugger_delete.c"
 }
 
 class CBreakPointBar : public wxAuiToolBar

Source/Core/DolphinWX/Debugger/CodeWindow.cpp

@@ -38,8 +38,8 @@
 
 extern "C"  // Bitmaps
 {
-	#include "../../resources/toolbar_add_memorycheck.c"
-	#include "../../resources/toolbar_add_breakpoint.c"
+	#include "../resources/toolbar_add_memorycheck.c"
+	#include "../resources/toolbar_add_breakpoint.c"
 }
 
 // -------

Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp

@@ -5,7 +5,7 @@
 #include "IniFile.h"
 #include "DebuggerPanel.h"
 #include "FileUtil.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../../Core/ConfigManager.h"
 
 #include "VideoConfig.h"
 #include "TextureCacheBase.h"

Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

@@ -24,7 +24,7 @@
 #include "HW/Memmap.h"
 #include "HW/DSP.h"
 
-#include "../../DolphinWX/Src/Globals.h"
+#include "../../DolphinWX/Globals.h"
 
 enum
 {

Source/Core/DolphinWX/DolphinWX.vcxproj

@@ -56,107 +56,107 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Src\AboutDolphin.cpp" />
-    <ClCompile Include="Src\ARCodeAddEdit.cpp" />
-    <ClCompile Include="Src\CheatsWindow.cpp" />
-    <ClCompile Include="Src\ConfigMain.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointView.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp" />
-    <ClCompile Include="Src\Debugger\CodeView.cpp" />
-    <ClCompile Include="Src\Debugger\CodeWindow.cpp" />
-    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp" />
-    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp" />
-    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp" />
-    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp" />
-    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp" />
-    <ClCompile Include="Src\Debugger\JitWindow.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryView.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryWindow.cpp" />
-    <ClCompile Include="Src\Debugger\RegisterView.cpp" />
-    <ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
-    <ClCompile Include="Src\FifoPlayerDlg.cpp" />
-    <ClCompile Include="Src\Frame.cpp" />
-    <ClCompile Include="Src\FrameAui.cpp" />
-    <ClCompile Include="Src\FrameTools.cpp" />
-    <ClCompile Include="Src\GameListCtrl.cpp" />
-    <ClCompile Include="Src\GeckoCodeDiag.cpp" />
-    <ClCompile Include="Src\GLInterface\WGL.cpp" />
-    <ClCompile Include="Src\HotkeyDlg.cpp" />
-    <ClCompile Include="Src\InputConfigDiag.cpp" />
-    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp" />
-    <ClCompile Include="Src\ISOFile.cpp" />
-    <ClCompile Include="Src\ISOProperties.cpp" />
-    <ClCompile Include="Src\LogConfigWindow.cpp" />
-    <ClCompile Include="Src\LogWindow.cpp" />
-    <ClCompile Include="Src\Main.cpp" />
-    <ClCompile Include="Src\MainNoGUI.cpp">
+    <ClCompile Include="AboutDolphin.cpp" />
+    <ClCompile Include="ARCodeAddEdit.cpp" />
+    <ClCompile Include="CheatsWindow.cpp" />
+    <ClCompile Include="ConfigMain.cpp" />
+    <ClCompile Include="Debugger\BreakpointDlg.cpp" />
+    <ClCompile Include="Debugger\BreakpointView.cpp" />
+    <ClCompile Include="Debugger\BreakpointWindow.cpp" />
+    <ClCompile Include="Debugger\CodeView.cpp" />
+    <ClCompile Include="Debugger\CodeWindow.cpp" />
+    <ClCompile Include="Debugger\CodeWindowFunctions.cpp" />
+    <ClCompile Include="Debugger\DebuggerPanel.cpp" />
+    <ClCompile Include="Debugger\DebuggerUIUtil.cpp" />
+    <ClCompile Include="Debugger\DSPDebugWindow.cpp" />
+    <ClCompile Include="Debugger\DSPRegisterView.cpp" />
+    <ClCompile Include="Debugger\JitWindow.cpp" />
+    <ClCompile Include="Debugger\MemoryCheckDlg.cpp" />
+    <ClCompile Include="Debugger\MemoryView.cpp" />
+    <ClCompile Include="Debugger\MemoryWindow.cpp" />
+    <ClCompile Include="Debugger\RegisterView.cpp" />
+    <ClCompile Include="Debugger\RegisterWindow.cpp" />
+    <ClCompile Include="FifoPlayerDlg.cpp" />
+    <ClCompile Include="Frame.cpp" />
+    <ClCompile Include="FrameAui.cpp" />
+    <ClCompile Include="FrameTools.cpp" />
+    <ClCompile Include="GameListCtrl.cpp" />
+    <ClCompile Include="GeckoCodeDiag.cpp" />
+    <ClCompile Include="GLInterface\WGL.cpp" />
+    <ClCompile Include="HotkeyDlg.cpp" />
+    <ClCompile Include="InputConfigDiag.cpp" />
+    <ClCompile Include="InputConfigDiagBitmaps.cpp" />
+    <ClCompile Include="ISOFile.cpp" />
+    <ClCompile Include="ISOProperties.cpp" />
+    <ClCompile Include="LogConfigWindow.cpp" />
+    <ClCompile Include="LogWindow.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainNoGUI.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="Src\MemcardManager.cpp" />
-    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
-    <ClCompile Include="Src\NetWindow.cpp" />
-    <ClCompile Include="Src\PatchAddEdit.cpp" />
-    <ClCompile Include="Src\PHackSettings.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="MemcardManager.cpp" />
+    <ClCompile Include="MemoryCards\WiiSaveCrypted.cpp" />
+    <ClCompile Include="NetWindow.cpp" />
+    <ClCompile Include="PatchAddEdit.cpp" />
+    <ClCompile Include="PHackSettings.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\TASInputDlg.cpp" />
-    <ClCompile Include="Src\UDPConfigDiag.cpp" />
-    <ClCompile Include="Src\VideoConfigDiag.cpp" />
-    <ClCompile Include="Src\WiimoteConfigDiag.cpp" />
-    <ClCompile Include="Src\WXInputBase.cpp" />
-    <ClCompile Include="Src\WxUtils.cpp" />
+    <ClCompile Include="TASInputDlg.cpp" />
+    <ClCompile Include="UDPConfigDiag.cpp" />
+    <ClCompile Include="VideoConfigDiag.cpp" />
+    <ClCompile Include="WiimoteConfigDiag.cpp" />
+    <ClCompile Include="WXInputBase.cpp" />
+    <ClCompile Include="WxUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
-    <ClInclude Include="Src\AboutDolphin.h" />
-    <ClInclude Include="Src\ARCodeAddEdit.h" />
-    <ClInclude Include="Src\CheatsWindow.h" />
-    <ClInclude Include="Src\ConfigMain.h" />
-    <ClInclude Include="Src\Debugger\BreakpointDlg.h" />
-    <ClInclude Include="Src\Debugger\BreakpointView.h" />
-    <ClInclude Include="Src\Debugger\BreakpointWindow.h" />
-    <ClInclude Include="Src\Debugger\CodeView.h" />
-    <ClInclude Include="Src\Debugger\CodeWindow.h" />
-    <ClInclude Include="Src\Debugger\DebuggerPanel.h" />
-    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h" />
-    <ClInclude Include="Src\Debugger\DSPDebugWindow.h" />
-    <ClInclude Include="Src\Debugger\DSPRegisterView.h" />
-    <ClInclude Include="Src\Debugger\JitWindow.h" />
-    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
-    <ClInclude Include="Src\Debugger\MemoryView.h" />
-    <ClInclude Include="Src\Debugger\MemoryWindow.h" />
-    <ClInclude Include="Src\Debugger\RegisterView.h" />
-    <ClInclude Include="Src\Debugger\RegisterWindow.h" />
-    <ClInclude Include="Src\FifoPlayerDlg.h" />
-    <ClInclude Include="Src\Frame.h" />
-    <ClInclude Include="Src\GameListCtrl.h" />
-    <ClInclude Include="Src\GeckoCodeDiag.h" />
-    <ClInclude Include="Src\GLInterface.h" />
-    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
-    <ClInclude Include="Src\GLInterface\WGL.h" />
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\HotkeyDlg.h" />
-    <ClInclude Include="Src\InputConfigDiag.h" />
-    <ClInclude Include="Src\ISOFile.h" />
-    <ClInclude Include="Src\ISOProperties.h" />
-    <ClInclude Include="Src\LogConfigWindow.h" />
-    <ClInclude Include="Src\LogWindow.h" />
-    <ClInclude Include="Src\Main.h" />
-    <ClInclude Include="Src\MemcardManager.h" />
-    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
-    <ClInclude Include="Src\NetWindow.h" />
-    <ClInclude Include="Src\PatchAddEdit.h" />
-    <ClInclude Include="Src\PHackSettings.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\TASInputDlg.h" />
-    <ClInclude Include="Src\UDPConfigDiag.h" />
-    <ClInclude Include="Src\VideoConfigDiag.h" />
-    <ClInclude Include="Src\WiimoteConfigDiag.h" />
-    <ClInclude Include="Src\WXInputBase.h" />
-    <ClInclude Include="Src\WxUtils.h" />
+    <ClInclude Include="AboutDolphin.h" />
+    <ClInclude Include="ARCodeAddEdit.h" />
+    <ClInclude Include="CheatsWindow.h" />
+    <ClInclude Include="ConfigMain.h" />
+    <ClInclude Include="Debugger\BreakpointDlg.h" />
+    <ClInclude Include="Debugger\BreakpointView.h" />
+    <ClInclude Include="Debugger\BreakpointWindow.h" />
+    <ClInclude Include="Debugger\CodeView.h" />
+    <ClInclude Include="Debugger\CodeWindow.h" />
+    <ClInclude Include="Debugger\DebuggerPanel.h" />
+    <ClInclude Include="Debugger\DebuggerUIUtil.h" />
+    <ClInclude Include="Debugger\DSPDebugWindow.h" />
+    <ClInclude Include="Debugger\DSPRegisterView.h" />
+    <ClInclude Include="Debugger\JitWindow.h" />
+    <ClInclude Include="Debugger\MemoryCheckDlg.h" />
+    <ClInclude Include="Debugger\MemoryView.h" />
+    <ClInclude Include="Debugger\MemoryWindow.h" />
+    <ClInclude Include="Debugger\RegisterView.h" />
+    <ClInclude Include="Debugger\RegisterWindow.h" />
+    <ClInclude Include="FifoPlayerDlg.h" />
+    <ClInclude Include="Frame.h" />
+    <ClInclude Include="GameListCtrl.h" />
+    <ClInclude Include="GeckoCodeDiag.h" />
+    <ClInclude Include="GLInterface.h" />
+    <ClInclude Include="GLInterface\InterfaceBase.h" />
+    <ClInclude Include="GLInterface\WGL.h" />
+    <ClInclude Include="Globals.h" />
+    <ClInclude Include="HotkeyDlg.h" />
+    <ClInclude Include="InputConfigDiag.h" />
+    <ClInclude Include="ISOFile.h" />
+    <ClInclude Include="ISOProperties.h" />
+    <ClInclude Include="LogConfigWindow.h" />
+    <ClInclude Include="LogWindow.h" />
+    <ClInclude Include="Main.h" />
+    <ClInclude Include="MemcardManager.h" />
+    <ClInclude Include="MemoryCards\WiiSaveCrypted.h" />
+    <ClInclude Include="NetWindow.h" />
+    <ClInclude Include="PatchAddEdit.h" />
+    <ClInclude Include="PHackSettings.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="TASInputDlg.h" />
+    <ClInclude Include="UDPConfigDiag.h" />
+    <ClInclude Include="VideoConfigDiag.h" />
+    <ClInclude Include="WiimoteConfigDiag.h" />
+    <ClInclude Include="WXInputBase.h" />
+    <ClInclude Include="WxUtils.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/DolphinWX/DolphinWX.vcxproj.filters

@@ -27,267 +27,267 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\GLInterface\WGL.cpp" />
-    <ClCompile Include="Src\Main.cpp" />
-    <ClCompile Include="Src\MainNoGUI.cpp" />
-    <ClCompile Include="Src\WXInputBase.cpp" />
-    <ClCompile Include="Src\WxUtils.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp">
+    <ClCompile Include="GLInterface\WGL.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainNoGUI.cpp" />
+    <ClCompile Include="WXInputBase.cpp" />
+    <ClCompile Include="WxUtils.cpp" />
+    <ClCompile Include="Debugger\BreakpointDlg.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointView.cpp">
+    <ClCompile Include="Debugger\BreakpointView.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp">
+    <ClCompile Include="Debugger\BreakpointWindow.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeView.cpp">
+    <ClCompile Include="Debugger\CodeView.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeWindow.cpp">
+    <ClCompile Include="Debugger\CodeWindow.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp">
+    <ClCompile Include="Debugger\CodeWindowFunctions.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp">
+    <ClCompile Include="Debugger\DebuggerUIUtil.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryView.cpp">
+    <ClCompile Include="Debugger\MemoryView.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp">
+    <ClCompile Include="Debugger\MemoryCheckDlg.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp">
+    <ClCompile Include="Debugger\DSPDebugWindow.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp">
+    <ClCompile Include="Debugger\DSPRegisterView.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\JitWindow.cpp">
+    <ClCompile Include="Debugger\JitWindow.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryWindow.cpp">
+    <ClCompile Include="Debugger\MemoryWindow.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\RegisterView.cpp">
+    <ClCompile Include="Debugger\RegisterView.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\RegisterWindow.cpp">
+    <ClCompile Include="Debugger\RegisterWindow.cpp">
       <Filter>GUI\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Src\InputConfigDiag.cpp">
+    <ClCompile Include="InputConfigDiag.cpp">
       <Filter>GUI\InputConfig</Filter>
     </ClCompile>
-    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp">
+    <ClCompile Include="InputConfigDiagBitmaps.cpp">
       <Filter>GUI\InputConfig</Filter>
     </ClCompile>
-    <ClCompile Include="Src\NetWindow.cpp">
+    <ClCompile Include="NetWindow.cpp">
       <Filter>GUI\NetPlay</Filter>
     </ClCompile>
-    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
+    <ClCompile Include="MemoryCards\WiiSaveCrypted.cpp">
       <Filter>GUI\Saves</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp">
+    <ClCompile Include="Debugger\DebuggerPanel.cpp">
       <Filter>GUI\Video</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VideoConfigDiag.cpp">
+    <ClCompile Include="VideoConfigDiag.cpp">
       <Filter>GUI\Video</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ISOFile.cpp">
+    <ClCompile Include="ISOFile.cpp">
       <Filter>Misc</Filter>
     </ClCompile>
-    <ClCompile Include="Src\AboutDolphin.cpp">
+    <ClCompile Include="AboutDolphin.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ARCodeAddEdit.cpp">
+    <ClCompile Include="ARCodeAddEdit.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\CheatsWindow.cpp">
+    <ClCompile Include="CheatsWindow.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ConfigMain.cpp">
+    <ClCompile Include="ConfigMain.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FifoPlayerDlg.cpp">
+    <ClCompile Include="FifoPlayerDlg.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Frame.cpp">
+    <ClCompile Include="Frame.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FrameAui.cpp">
+    <ClCompile Include="FrameAui.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FrameTools.cpp">
+    <ClCompile Include="FrameTools.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\GameListCtrl.cpp">
+    <ClCompile Include="GameListCtrl.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\GeckoCodeDiag.cpp">
+    <ClCompile Include="GeckoCodeDiag.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\HotkeyDlg.cpp">
+    <ClCompile Include="HotkeyDlg.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ISOProperties.cpp">
+    <ClCompile Include="ISOProperties.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\LogConfigWindow.cpp">
+    <ClCompile Include="LogConfigWindow.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\LogWindow.cpp">
+    <ClCompile Include="LogWindow.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\MemcardManager.cpp">
+    <ClCompile Include="MemcardManager.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\PatchAddEdit.cpp">
+    <ClCompile Include="PatchAddEdit.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\PHackSettings.cpp">
+    <ClCompile Include="PHackSettings.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\TASInputDlg.cpp">
+    <ClCompile Include="TASInputDlg.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\UDPConfigDiag.cpp">
+    <ClCompile Include="UDPConfigDiag.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\WiimoteConfigDiag.cpp">
+    <ClCompile Include="WiimoteConfigDiag.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
-    <ClInclude Include="Src\GLInterface\WGL.h" />
-    <ClInclude Include="Src\GLInterface.h" />
-    <ClInclude Include="Src\Main.h" />
-    <ClInclude Include="Src\WXInputBase.h" />
-    <ClInclude Include="Src\WxUtils.h" />
-    <ClInclude Include="Src\Debugger\BreakpointDlg.h">
+    <ClInclude Include="GLInterface\InterfaceBase.h" />
+    <ClInclude Include="GLInterface\WGL.h" />
+    <ClInclude Include="GLInterface.h" />
+    <ClInclude Include="Main.h" />
+    <ClInclude Include="WXInputBase.h" />
+    <ClInclude Include="WxUtils.h" />
+    <ClInclude Include="Debugger\BreakpointDlg.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointView.h">
+    <ClInclude Include="Debugger\BreakpointView.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointWindow.h">
+    <ClInclude Include="Debugger\BreakpointWindow.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\CodeView.h">
+    <ClInclude Include="Debugger\CodeView.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\CodeWindow.h">
+    <ClInclude Include="Debugger\CodeWindow.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h">
+    <ClInclude Include="Debugger\DebuggerUIUtil.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryView.h">
+    <ClInclude Include="Debugger\MemoryView.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h">
+    <ClInclude Include="Debugger\MemoryCheckDlg.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\DSPDebugWindow.h">
+    <ClInclude Include="Debugger\DSPDebugWindow.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\DSPRegisterView.h">
+    <ClInclude Include="Debugger\DSPRegisterView.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\JitWindow.h">
+    <ClInclude Include="Debugger\JitWindow.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryWindow.h">
+    <ClInclude Include="Debugger\MemoryWindow.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\RegisterView.h">
+    <ClInclude Include="Debugger\RegisterView.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\RegisterWindow.h">
+    <ClInclude Include="Debugger\RegisterWindow.h">
       <Filter>GUI\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Src\InputConfigDiag.h">
+    <ClInclude Include="InputConfigDiag.h">
       <Filter>GUI\InputConfig</Filter>
     </ClInclude>
-    <ClInclude Include="Src\NetWindow.h">
+    <ClInclude Include="NetWindow.h">
       <Filter>GUI\NetPlay</Filter>
     </ClInclude>
-    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
+    <ClInclude Include="MemoryCards\WiiSaveCrypted.h">
       <Filter>GUI\Saves</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Debugger\DebuggerPanel.h">
+    <ClInclude Include="Debugger\DebuggerPanel.h">
       <Filter>GUI\Video</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VideoConfigDiag.h">
+    <ClInclude Include="VideoConfigDiag.h">
       <Filter>GUI\Video</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ISOFile.h">
+    <ClInclude Include="ISOFile.h">
       <Filter>Misc</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Resources</Filter>
     </ClInclude>
-    <ClInclude Include="Src\AboutDolphin.h">
+    <ClInclude Include="AboutDolphin.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ARCodeAddEdit.h">
+    <ClInclude Include="ARCodeAddEdit.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\CheatsWindow.h">
+    <ClInclude Include="CheatsWindow.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ConfigMain.h">
+    <ClInclude Include="ConfigMain.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FifoPlayerDlg.h">
+    <ClInclude Include="FifoPlayerDlg.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Frame.h">
+    <ClInclude Include="Frame.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\GameListCtrl.h">
+    <ClInclude Include="GameListCtrl.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\GeckoCodeDiag.h">
+    <ClInclude Include="GeckoCodeDiag.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Globals.h">
+    <ClInclude Include="Globals.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\HotkeyDlg.h">
+    <ClInclude Include="HotkeyDlg.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ISOProperties.h">
+    <ClInclude Include="ISOProperties.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\LogConfigWindow.h">
+    <ClInclude Include="LogConfigWindow.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\LogWindow.h">
+    <ClInclude Include="LogWindow.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\MemcardManager.h">
+    <ClInclude Include="MemcardManager.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PatchAddEdit.h">
+    <ClInclude Include="PatchAddEdit.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PHackSettings.h">
+    <ClInclude Include="PHackSettings.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\TASInputDlg.h">
+    <ClInclude Include="TASInputDlg.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\UDPConfigDiag.h">
+    <ClInclude Include="UDPConfigDiag.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\WiimoteConfigDiag.h">
+    <ClInclude Include="WiimoteConfigDiag.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/DolphinWX/Frame.cpp

@@ -41,7 +41,7 @@
 // Resources
 
 extern "C" {
-#include "../resources/Dolphin.c" // Dolphin icon
+#include "resources/Dolphin.c" // Dolphin icon
 };
 
 

Source/Core/DolphinWX/FrameTools.cpp

@@ -78,7 +78,7 @@ Core::GetWindowHandle().
 
 // Resources
 extern "C" {
-#include "../resources/Dolphin.c" // Dolphin icon
+#include "resources/Dolphin.c" // Dolphin icon
 };
 
 bool confirmStop = false;

Source/Core/DolphinWX/GameListCtrl.cpp

@@ -26,21 +26,21 @@
 #include "MathUtil.h"
 #include "HW/DVDInterface.h"
 
-#include "../resources/Flag_Europe.xpm"
-#include "../resources/Flag_Germany.xpm"
-#include "../resources/Flag_France.xpm"
-#include "../resources/Flag_Italy.xpm"
-#include "../resources/Flag_Japan.xpm"
-#include "../resources/Flag_USA.xpm"
-#include "../resources/Flag_Taiwan.xpm"
-#include "../resources/Flag_Korea.xpm"
-#include "../resources/Flag_Unknown.xpm"
-#include "../resources/Flag_SDK.xpm"
+#include "resources/Flag_Europe.xpm"
+#include "resources/Flag_Germany.xpm"
+#include "resources/Flag_France.xpm"
+#include "resources/Flag_Italy.xpm"
+#include "resources/Flag_Japan.xpm"
+#include "resources/Flag_USA.xpm"
+#include "resources/Flag_Taiwan.xpm"
+#include "resources/Flag_Korea.xpm"
+#include "resources/Flag_Unknown.xpm"
+#include "resources/Flag_SDK.xpm"
 
-#include "../resources/Platform_Wad.xpm"
-#include "../resources/Platform_Wii.xpm"
-#include "../resources/Platform_Gamecube.xpm"
-#include "../resources/rating_gamelist.h"
+#include "resources/Platform_Wad.xpm"
+#include "resources/Platform_Wii.xpm"
+#include "resources/Platform_Gamecube.xpm"
+#include "resources/rating_gamelist.h"
 
 size_t CGameListCtrl::m_currentItem = 0;
 size_t CGameListCtrl::m_numberItem = 0;

Source/Core/DolphinWX/ISOProperties.cpp

@@ -24,9 +24,9 @@
 #include "ConfigManager.h"
 #include "StringUtil.h"
 
-#include "../resources/isoprop_file.xpm"
-#include "../resources/isoprop_folder.xpm"
-#include "../resources/isoprop_disc.xpm"
+#include "resources/isoprop_file.xpm"
+#include "resources/isoprop_folder.xpm"
+#include "resources/isoprop_disc.xpm"
 
 struct WiiPartition
 {

Source/Core/DolphinWX/TASInputDlg.h

@@ -9,7 +9,7 @@
 
 #include "Common.h"
 #include "CoreParameter.h"
-#include "../../InputCommon/Src/GCPadStatus.h"
+#include "../InputCommon/GCPadStatus.h"
 
 class TASInputDlg : public wxDialog
 {