Remove unnecessary Src/ folders

Source/Core/InputCommon/CMakeLists.txt

@@ -1,35 +1,35 @@
-set(SRCS	Src/ControllerEmu.cpp
-			Src/InputConfig.cpp
-			Src/UDPWiimote.cpp
-			Src/UDPWrapper.cpp
-			Src/ControllerInterface/ControllerInterface.cpp
-			Src/ControllerInterface/Device.cpp
-			Src/ControllerInterface/ExpressionParser.cpp)
+set(SRCS	ControllerEmu.cpp
+			InputConfig.cpp
+			UDPWiimote.cpp
+			UDPWrapper.cpp
+			ControllerInterface/ControllerInterface.cpp
+			ControllerInterface/Device.cpp
+			ControllerInterface/ExpressionParser.cpp)
 
 if(WIN32)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/DInput/DInput.cpp
-				Src/ControllerInterface/DInput/DInputJoystick.cpp
-				Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
-				Src/ControllerInterface/SDL/SDL.cpp
-				Src/ControllerInterface/XInput/XInput.cpp)
+				ControllerInterface/DInput/DInput.cpp
+				ControllerInterface/DInput/DInputJoystick.cpp
+				ControllerInterface/DInput/DInputKeyboardMouse.cpp
+				ControllerInterface/SDL/SDL.cpp
+				ControllerInterface/XInput/XInput.cpp)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/OSX/OSX.mm
-				Src/ControllerInterface/OSX/OSXKeyboard.mm
-				Src/ControllerInterface/OSX/OSXJoystick.mm
-				Src/ControllerInterface/SDL/SDL.cpp)
+				ControllerInterface/OSX/OSX.mm
+				ControllerInterface/OSX/OSXKeyboard.mm
+				ControllerInterface/OSX/OSXJoystick.mm
+				ControllerInterface/SDL/SDL.cpp)
 elseif(X11_FOUND)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/SDL/SDL.cpp
-				Src/ControllerInterface/Xlib/Xlib.cpp)
+				ControllerInterface/SDL/SDL.cpp
+				ControllerInterface/Xlib/Xlib.cpp)
 	if(XINPUT2_FOUND)
 		set(SRCS	${SRCS}
-					Src/ControllerInterface/Xlib/XInput2.cpp)
+					ControllerInterface/Xlib/XInput2.cpp)
 	endif()
 elseif(ANDROID)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/Android/Android.cpp)
+				ControllerInterface/Android/Android.cpp)
 endif()
 
 add_dolphin_library(inputcommon "${SRCS}" "")

Source/Core/InputCommon/InputCommon.vcxproj

@@ -43,37 +43,37 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="Src\ControllerEmu.cpp" />
-    <ClCompile Include="Src\ControllerInterface\ControllerInterface.cpp" />
-    <ClCompile Include="Src\ControllerInterface\Device.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputJoystick.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
-    <ClCompile Include="Src\ControllerInterface\ExpressionParser.cpp" />
-    <ClCompile Include="Src\ControllerInterface\SDL\SDL.cpp" />
-    <ClCompile Include="Src\ControllerInterface\XInput\XInput.cpp" />
-    <ClCompile Include="Src\InputConfig.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="ControllerEmu.cpp" />
+    <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
+    <ClCompile Include="ControllerInterface\Device.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
+    <ClCompile Include="ControllerInterface\ExpressionParser.cpp" />
+    <ClCompile Include="ControllerInterface\SDL\SDL.cpp" />
+    <ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
+    <ClCompile Include="InputConfig.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\UDPWiimote.cpp" />
-    <ClCompile Include="Src\UDPWrapper.cpp" />
+    <ClCompile Include="UDPWiimote.cpp" />
+    <ClCompile Include="UDPWrapper.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\ControllerEmu.h" />
-    <ClInclude Include="Src\ControllerInterface\ControllerInterface.h" />
-    <ClInclude Include="Src\ControllerInterface\Device.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInput.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputJoystick.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.h" />
-    <ClInclude Include="Src\ControllerInterface\ExpressionParser.h" />
-    <ClInclude Include="Src\ControllerInterface\SDL\SDL.h" />
-    <ClInclude Include="Src\ControllerInterface\XInput\XInput.h" />
-    <ClInclude Include="Src\GCPadStatus.h" />
-    <ClInclude Include="Src\InputConfig.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\UDPWiimote.h" />
-    <ClInclude Include="Src\UDPWrapper.h" />
+    <ClInclude Include="ControllerEmu.h" />
+    <ClInclude Include="ControllerInterface\ControllerInterface.h" />
+    <ClInclude Include="ControllerInterface\Device.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInput.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h" />
+    <ClInclude Include="ControllerInterface\ExpressionParser.h" />
+    <ClInclude Include="ControllerInterface\SDL\SDL.h" />
+    <ClInclude Include="ControllerInterface\XInput\XInput.h" />
+    <ClInclude Include="GCPadStatus.h" />
+    <ClInclude Include="InputConfig.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="UDPWiimote.h" />
+    <ClInclude Include="UDPWrapper.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
@@ -86,4 +86,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/InputCommon/InputCommon.vcxproj.filters

@@ -15,69 +15,69 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\ControllerEmu.cpp" />
-    <ClCompile Include="Src\InputConfig.cpp" />
-    <ClCompile Include="Src\UDPWiimote.cpp" />
-    <ClCompile Include="Src\UDPWrapper.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp">
+    <ClCompile Include="ControllerEmu.cpp" />
+    <ClCompile Include="InputConfig.cpp" />
+    <ClCompile Include="UDPWiimote.cpp" />
+    <ClCompile Include="UDPWrapper.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInput.cpp">
       <Filter>ControllerInterface\DInput</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputJoystick.cpp">
+    <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp">
       <Filter>ControllerInterface\DInput</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.cpp">
+    <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp">
       <Filter>ControllerInterface\DInput</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\XInput\XInput.cpp">
+    <ClCompile Include="ControllerInterface\XInput\XInput.cpp">
       <Filter>ControllerInterface\XInput</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\SDL\SDL.cpp">
+    <ClCompile Include="ControllerInterface\SDL\SDL.cpp">
       <Filter>ControllerInterface\SDL</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\Device.cpp">
+    <ClCompile Include="ControllerInterface\Device.cpp">
       <Filter>ControllerInterface</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\ControllerInterface.cpp">
+    <ClCompile Include="ControllerInterface\ControllerInterface.cpp">
       <Filter>ControllerInterface</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\ExpressionParser.cpp">
+    <ClCompile Include="ControllerInterface\ExpressionParser.cpp">
       <Filter>ControllerInterface</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\ControllerEmu.h" />
-    <ClInclude Include="Src\GCPadStatus.h" />
-    <ClInclude Include="Src\InputConfig.h" />
-    <ClInclude Include="Src\UDPWiimote.h" />
-    <ClInclude Include="Src\UDPWrapper.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInput.h">
+    <ClInclude Include="ControllerEmu.h" />
+    <ClInclude Include="GCPadStatus.h" />
+    <ClInclude Include="InputConfig.h" />
+    <ClInclude Include="UDPWiimote.h" />
+    <ClInclude Include="UDPWrapper.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInput.h">
       <Filter>ControllerInterface\DInput</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputJoystick.h">
+    <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h">
       <Filter>ControllerInterface\DInput</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.h">
+    <ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h">
       <Filter>ControllerInterface\DInput</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\XInput\XInput.h">
+    <ClInclude Include="ControllerInterface\XInput\XInput.h">
       <Filter>ControllerInterface\XInput</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\SDL\SDL.h">
+    <ClInclude Include="ControllerInterface\SDL\SDL.h">
       <Filter>ControllerInterface\SDL</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\ControllerInterface.h">
+    <ClInclude Include="ControllerInterface\ControllerInterface.h">
       <Filter>ControllerInterface</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\Device.h">
+    <ClInclude Include="ControllerInterface\Device.h">
       <Filter>ControllerInterface</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\ExpressionParser.h">
+    <ClInclude Include="ControllerInterface\ExpressionParser.h">
       <Filter>ControllerInterface</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>

Source/Core/InputCommon/InputConfig.cpp

@@ -4,8 +4,8 @@
 
 #include "InputConfig.h"
 #include "CommonPaths.h"
-#include "../../Core/Src/ConfigManager.h"
-#include "../../Core/Src/HW/Wiimote.h"
+#include "../Core/ConfigManager.h"
+#include "../Core/HW/Wiimote.h"
 
 InputPlugin::~InputPlugin()
 {