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

Remove long-rotted vestiges of SDL video output.

Browse Source 
Use SDL for input devices only on Windows and Linux. 
(Still globally enabled for the legacy Wiimote plugin.)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5886 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-07-16 19:17:35 +00:00
parent aa998896ac
commit 697480f5cc
9 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
View File

@ -14,15 +14,16 @@
#define CIFACE_USE_DINPUT_JOYSTICK
#define CIFACE_USE_DINPUT_KBM
#define CIFACE_USE_DINPUT
#endif
#if defined(HAVE_X11) && HAVE_X11
#define CIFACE_USE_XLIB
#endif
//#ifndef CIFACE_USE_DIRECTINPUT_JOYSTICK
//#ifndef CIFACE_USE_DINPUT_JOYSTICK
// enable SDL 1.2 in addition to DirectInput on windows,
// to support a few gamepads that aren't behaving with DInput
#define CIFACE_USE_SDL
//#endif
#endif
#if defined(HAVE_X11) && HAVE_X11
#define CIFACE_USE_XLIB
#define CIFACE_USE_SDL
#endif
#if defined(__APPLE__)
#define CIFACE_USE_OSX
#endif

11
Source/Core/InputCommon/Src/SConscript
View File

@ -6,9 +6,7 @@ files = [
'Configuration.cpp',
'ControllerEmu.cpp',
'InputConfig.cpp',
'SDL_Util.cpp',
'ControllerInterface/ControllerInterface.cpp',
'ControllerInterface/SDL/SDL.cpp',
'UDPWiimote.cpp',
'UDPWrapper.cpp'
]
@ -24,7 +22,8 @@ elif sys.platform == 'darwin':
files += [
'ControllerInterface/OSX/OSX.mm',
'ControllerInterface/OSX/OSXKeyboard.mm',
'ControllerInterface/OSX/OSXMouse.mm'
'ControllerInterface/OSX/OSXMouse.mm',
'SDL_Util.cpp', # XXX needed by old Wiimote plugin
]
else:
files += [
@ -32,4 +31,10 @@ else:
'X11InputBase.cpp'
]
if sys.platform == 'win32' or sys.platform == 'linux2':
files += [
'ControllerInterface/SDL/SDL.cpp',
'SDL_Util.cpp',
]
env.StaticLibrary(env['local_libs'] + "inputcommon", files)