Fixes Issue 2164

Conflicts are due to same file name when omitting full path

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4982 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/InputCommon/InputCommon.vcproj

@@ -441,23 +441,19 @@
 			>
 		</File>
 		<File
-			RelativePath=".\Src\SConscript"
+			RelativePath=".\Src\SDL_Util.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\Src\SDL.cpp"
+			RelativePath=".\Src\SDL_Util.h"
 			>
 		</File>
 		<File
-			RelativePath=".\Src\SDL.h"
+			RelativePath=".\Src\XInput_Util.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\Src\XInput.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\XInput.h"
+			RelativePath=".\Src\XInput_Util.h"
 			>
 		</File>
 	</Files>

Source/Core/InputCommon/Src/InputCommon.h

@@ -4,6 +4,26 @@
 
 namespace InputCommon
 {
+enum EButtonType
+{
+	CTL_AXIS = 0,
+	CTL_HAT,
+	CTL_BUTTON,	
+	CTL_KEY,
+};
+
+enum ETriggerType
+{
+	CTL_TRIGGER_SDL = 0,
+	CTL_TRIGGER_XINPUT,
+};
+
+enum EXInputTrigger
+{
+	XI_TRIGGER_L = 0,
+	XI_TRIGGER_R,
+};
+
     void Init(); 
     void Shutdown();
 }

Source/Core/InputCommon/Src/SConscript

@@ -6,7 +6,7 @@ files = [
 	'Configuration.cpp',
 	'EventHandler.cpp',
 	'InputCommon.cpp',
-	'SDL.cpp',
+	'SDL_Util.cpp',
 	]
 
 if env['HAVE_X11']:

Source/Core/InputCommon/Src/SDL_Util.cpp

@@ -29,8 +29,11 @@
 
 
 #define _SDL_MAIN_ // Avoid certain declarations in SDL.h
-#include "SDL.h" // Local
-#include "XInput.h"
+#include "InputCommon.h"
+#include "SDL_Util.h" // Local
+#ifdef _WIN32
+#include "XInput_Util.h"
+#endif
 
 namespace InputCommon
 {

Source/Core/InputCommon/Src/SDL_Util.h

@@ -43,26 +43,6 @@
 namespace InputCommon
 {
 
-enum EButtonType
-{
-	CTL_AXIS = 0,
-	CTL_HAT,
-	CTL_BUTTON,	
-	CTL_KEY,
-};
-
-enum ETriggerType
-{
-	CTL_TRIGGER_SDL = 0,
-	CTL_TRIGGER_XINPUT,
-};
-
-enum EXInputTrigger
-{
-	XI_TRIGGER_L = 0,
-	XI_TRIGGER_R,
-};
-
 struct CONTROLLER_INFO		// CONNECTED WINDOWS DEVICES INFO
 {
 	int NumAxes;			// Amount of Axes

Source/Core/InputCommon/Src/XInput_Util.cpp

@@ -36,16 +36,11 @@
 // -------------------
 #include <windows.h>
 #include <XInput.h> // XInput API
-
-#include "SDL.h" // Local
-
-
+#include "InputCommon.h"
 
 namespace XInput
 {
 
-
-
 // Declarations
 // -------------------
 
@@ -59,8 +54,6 @@ struct CONTROLER_STATE
 CONTROLER_STATE g_Controllers[MAX_CONTROLLERS];
 
 
-
-
 // Init
 // -------------------
 /* Function: Calculate the number of connected XInput devices
@@ -89,8 +82,6 @@ void Init()
 }	
 
 
-
-
 // Get the trigger status
 // -------------------
 int GetXI(int Controller, int Button)
@@ -115,8 +106,6 @@ int GetXI(int Controller, int Button)
 }
 
 
-
-
 // Check if a certain controller is connected
 // -------------------
 bool IsConnected(int Controller)
@@ -130,7 +119,6 @@ bool IsConnected(int Controller)
 		return false;
 }
 
-
 } // XInput
 
 #endif

Source/Core/InputCommon/Src/XInput_Util.h

@@ -27,12 +27,9 @@
 #include <iostream>
 
 
-
-
 namespace XInput
 {
 
-
 // Declarations
 // ----------
 void Init();

Source/Plugins/Plugin_GCPad/Src/GCPad.h

@@ -22,9 +22,10 @@
 
 #include <vector> // System
 #include <cstdio>
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
+#include "../../../Core/InputCommon/Src/InputCommon.h" // Core
+#include "../../../Core/InputCommon/Src/SDL_Util.h"
 #ifdef _WIN32
-   #include "../../../Core/InputCommon/Src/XInput.h"
+   #include "../../../Core/InputCommon/Src/XInput_Util.h"
 #elif defined(HAVE_X11) && HAVE_X11
    #include <X11/Xlib.h>
    #include <X11/Xutil.h>

Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp

@@ -23,12 +23,6 @@
 #include "Config.h"
 #include "EmuDefinitions.h" // for joyinfo
 
-enum TriggerType
-{
-	CTL_TRIGGER_SDL = 0,
-	CTL_TRIGGER_XINPUT
-};
-
 BEGIN_EVENT_TABLE(WiimotePadConfigDialog,wxDialog)
 
 	EVT_CLOSE(WiimotePadConfigDialog::OnClose)

Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h

@@ -21,8 +21,11 @@
 #include <vector>
 #include <string>
 
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
-#include "../../../Core/InputCommon/Src/XInput.h"
+#include "../../../Core/InputCommon/Src/InputCommon.h" // Core
+#include "../../../Core/InputCommon/Src/SDL_Util.h"
+#ifdef _WIN32
+#include "../../../Core/InputCommon/Src/XInput_Util.h"
+#endif
 
 #include "Common.h"
 #include "pluginspecs_wiimote.h"

Source/Plugins/Plugin_Wiimote/Src/EmuDynamics.cpp

@@ -18,8 +18,6 @@
 #include <vector>
 #include <string>
 
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
-#include "../../../Core/InputCommon/Src/XInput.h"
 
 #include "Common.h" // Common
 #include "MathUtil.h"

Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp

@@ -18,9 +18,6 @@
 #include <vector>
 #include <string>
 
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
-#include "../../../Core/InputCommon/Src/XInput.h"
-
 #include "Common.h" // Common
 #include "StringUtil.h" // for ArrayToString()
 #include "IniFile.h"

Source/Plugins/Plugin_Wiimote/Src/EmuMain.h

@@ -21,8 +21,6 @@
 
 #include <string>
 
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
-
 #include "wiimote_hid.h"
 #include "EmuDefinitions.h"
 #include "ChunkFile.h"

Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp

@@ -19,9 +19,6 @@
 #include <vector>
 #include <string>
 
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
-#include "../../../Core/InputCommon/Src/XInput.h"
-
 #include "Common.h" // Common
 #include "StringUtil.h" // for ArrayToString()
 #include "IniFile.h"

Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp

@@ -16,10 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 //
 
-
-#include "../../../Core/InputCommon/Src/SDL.h" // Core
 #include "EmuDefinitions.h"
-
 #ifdef _WIN32
 #include "XInput.h"
 #endif