Temporarily re-enable SDL pad input on OS X.

Placeholder SConscript for VideoMerge plugin.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6272 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-10-12 22:26:30 +00:00
parent a89b8f4a7d
commit e81a10fb44
5 changed files with 71 additions and 4 deletions

View File

@ -6,8 +6,8 @@ files = [
'ControllerEmu.cpp',
'InputConfig.cpp',
'ControllerInterface/ControllerInterface.cpp',
'UDPWiimote.cpp',
'UDPWrapper.cpp',
#'UDPWiimote.cpp',
#'UDPWrapper.cpp',
]
if sys.platform == 'win32':
@ -23,6 +23,7 @@ elif sys.platform == 'darwin':
'ControllerInterface/OSX/OSX.mm',
'ControllerInterface/OSX/OSXKeyboard.mm',
'ControllerInterface/OSX/OSXMouse.mm',
'ControllerInterface/SDL/SDL.cpp',
]
elif env['HAVE_X11']:
files += [