summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/SConscript
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2010-07-16 19:17:35 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2010-07-16 19:17:35 +0000
commit697480f5cc747c8777c6c3f97de032f6586fbd2c (patch)
treea6142db65dd12cd4bf5a25aa9f050391830aeb56 /Source/Core/InputCommon/Src/SConscript
parentaa998896aceaafe3b8d7e518af5bb8beedfa20c9 (diff)
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
Diffstat (limited to 'Source/Core/InputCommon/Src/SConscript')
-rw-r--r--Source/Core/InputCommon/Src/SConscript11
1 files changed, 8 insertions, 3 deletions
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)