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

Source/Core/DolphinWX/Src/MainNoGUI.cpp

@@ -356,10 +356,6 @@ int main(int argc, char *argv[])
 
 int appleMain(int argc, char *argv[])
 #else
-// Include SDL header so it can hijack main().
-#if defined(USE_SDL) && USE_SDL
-#include <SDL.h>
-#endif
 int main(int argc, char* argv[])
 #endif
 {

Source/Core/DolphinWX/Src/SConscript

@@ -13,7 +13,6 @@ files = [
 libs = [
 	'core', 'lzo2', 'discio', 'bdisasm', 'videocommon',
 	'inputcommon', 'common', 'lua', 'z', 'sfml-network',
-	'SDL'
 	]
 
 if wxenv['HAVE_WX']:

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
+//#ifndef CIFACE_USE_DINPUT_JOYSTICK
-#if defined(HAVE_X11) && HAVE_X11
-	#define CIFACE_USE_XLIB
-#endif
-//#ifndef CIFACE_USE_DIRECTINPUT_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

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)

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h

@@ -45,10 +45,6 @@
 #include <X11/keysym.h>
 #include "Thread.h"
 
-#elif defined(USE_SDL) && USE_SDL
-#include <GL/glew.h>
-#include <SDL.h>
-
 #elif defined(__APPLE__)
 #include <GL/glew.h>
 #include "cocoaGL.h"

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -28,7 +28,7 @@ files = [
 linkFlags = [
 	]
 libs = [
-	'videocommon', 'GLEW', 'SDL', 'SOIL', 'common'
+	'videocommon', 'GLEW', 'SOIL', 'common'
 	]
 
 gfxenv = env.Clone()

Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h

@@ -47,9 +47,6 @@
 #define I_NEED_OS2_H // HAXXOR
 #include <GL/glxew.h>
 #include <X11/XKBlib.h>
-#elif defined(USE_SDL) && USE_SDL
-#include <GL/glew.h>
-#include <SDL.h>
 #else
 #include <GL/glew.h>
 #endif // end USE_WX

Source/Plugins/Plugin_VideoSoftware/Src/SConscript

@@ -39,7 +39,7 @@ files = [
 linkFlags = [
 	]
 libs = [
-	'videocommon', 'GLEW', 'SDL', 'SOIL', 'common'
+	'videocommon', 'GLEW', 'SOIL', 'common'
 	]
 
 gfxenv = env.Clone()

Source/Plugins/Plugin_WiimoteNew/Src/SConscript

@@ -19,12 +19,15 @@ files = [
 	'WiimoteNew.cpp'
 	]
 
-libs = [ 'inputcommon', 'common', 'SDL' ]
-
 cxxflags = [ ]
 
+libs = [ 'inputcommon', 'common']
+
+if sys.platform == 'win32' or sys.platform == 'linux2':
+	libs += [ 'SDL' ]
+
 if wiinewenv['HAVE_WX']:
-	libs = [ 'inputuicommon' ] + libs
+	libs += [ 'inputuicommon' ]
 	files += [ 'WiimoteConfigDiag.cpp' ]
 
 if wiinewenv['HAVE_WIIUSE']: