diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-03 19:44:56 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-03 19:44:56 +0000 |
| commit | 05719ac81ab1e784c7aeb85af1e9b227b9cdbe83 (patch) | |
| tree | 027c8f2c6749972d41787e1180ff01fab3c0fd5c /Source/Core/InputCommon | |
| parent | 1e2d9223429e8bc52dab71fb2033f60dd72dea40 (diff) | |
Move SConscript files out from the Src subdirectories to be
consistent with the other build systems.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7282 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/SConscript | 34 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 33 |
2 files changed, 34 insertions, 33 deletions
diff --git a/Source/Core/InputCommon/SConscript b/Source/Core/InputCommon/SConscript new file mode 100644 index 0000000000..82e0de571c --- /dev/null +++ b/Source/Core/InputCommon/SConscript @@ -0,0 +1,34 @@ +# -*- 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) diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript deleted file mode 100644 index e085527348..0000000000 --- a/Source/Core/InputCommon/Src/SConscript +++ /dev/null @@ -1,33 +0,0 @@ -# -*- python -*- -import sys -Import('env') - -files = [ - 'ControllerEmu.cpp', - 'InputConfig.cpp', - 'ControllerInterface/ControllerInterface.cpp', - 'UDPWiimote.cpp', - 'UDPWrapper.cpp', - ] - -if sys.platform == 'win32': - files += [ - 'ControllerInterface/DInput/DInput.cpp', - 'ControllerInterface/DInput/DInputJoystick.cpp', - 'ControllerInterface/DInput/DInputKeyboardMouse.cpp' - 'ControllerInterface/SDL/SDL.cpp', - 'ControllerInterface/XInput/XInput.cpp', - ] -elif sys.platform == 'darwin': - files += [ - 'ControllerInterface/OSX/OSX.mm', - 'ControllerInterface/OSX/OSXKeyboard.mm', - 'ControllerInterface/OSX/OSXJoystick.mm', - ] -elif env['HAVE_X11']: - files += [ - 'ControllerInterface/SDL/SDL.cpp', - 'ControllerInterface/Xlib/Xlib.cpp', - ] - -env['LIBS'] += env.StaticLibrary('inputcommon', files) |