piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Issue 2164

Browse Source 
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
This commit is contained in:
ayuanx
2010-01-29 04:42:19 +00:00
parent f9dd509459
commit fdaa0e8d4c
15 changed files with 499 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_GCPad/Src/GCPad.h
View File

@ -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>

6
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
View File

@ -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)

7
Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h
View File

@ -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"

2
Source/Plugins/Plugin_Wiimote/Src/EmuDynamics.cpp
View File

@ -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"

3
Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
View File

@ -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"

2
Source/Plugins/Plugin_Wiimote/Src/EmuMain.h
View File

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

3
Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
View File

@ -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"

3
Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp
View File

@ -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