From 697480f5cc747c8777c6c3f97de032f6586fbd2c Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Fri, 16 Jul 2010 19:17:35 +0000
Subject: Remove long-rotted vestiges of SDL video output.

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
---
 .../InputCommon/Src/ControllerInterface/ControllerInterface.h | 11 ++++++-----
 Source/Core/InputCommon/Src/SConscript                        | 11 ++++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'Source/Core/InputCommon')

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index db015cd72b..903797a6e4 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -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
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index 1759516d5f..6b189be449 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -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)
-- 
cgit v1.2.3