diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
| commit | fdff4cb1ffa76e894dd41ca5f97d31f122fd3f86 (patch) | |
| tree | 20059e8c98923d27f235c9f12de31be97e20240f /Source/Core/InputCommon/SConscript | |
| parent | 2b77acc705eae11fdb4a25be6d6ea5db1fa52e21 (diff) | |
| parent | 5a8ad9230271a5088b0cf582932959214c6b5527 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
Diffstat (limited to 'Source/Core/InputCommon/SConscript')
| -rw-r--r-- | Source/Core/InputCommon/SConscript | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/Source/Core/InputCommon/SConscript b/Source/Core/InputCommon/SConscript deleted file mode 100644 index 82e0de571c..0000000000 --- a/Source/Core/InputCommon/SConscript +++ /dev/null @@ -1,34 +0,0 @@ -# -*- python -*- - -import sys -Import('env') - -files = [ - 'Src/ControllerEmu.cpp', - 'Src/ControllerInterface/ControllerInterface.cpp', - 'Src/InputConfig.cpp', - 'Src/UDPWiimote.cpp', - 'Src/UDPWrapper.cpp', - ] - -if sys.platform == 'win32': - files += [ - 'Src/ControllerInterface/DInput/DInput.cpp', - 'Src/ControllerInterface/DInput/DInputJoystick.cpp', - 'Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp' - 'Src/ControllerInterface/SDL/SDL.cpp', - 'Src/ControllerInterface/XInput/XInput.cpp', - ] -elif sys.platform == 'darwin': - files += [ - 'Src/ControllerInterface/OSX/OSX.mm', - 'Src/ControllerInterface/OSX/OSXKeyboard.mm', - 'Src/ControllerInterface/OSX/OSXJoystick.mm', - ] -elif env['HAVE_X11']: - files += [ - 'Src/ControllerInterface/SDL/SDL.cpp', - 'Src/ControllerInterface/Xlib/Xlib.cpp', - ] - -env['LIBS'] += env.StaticLibrary('inputcommon', files) |