diff options
Diffstat (limited to 'Source/Core/InputCommon')
4 files changed, 1 insertions, 37 deletions
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 8eed835b2d..dc987d83a2 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -191,7 +191,6 @@ </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> - <None Include="Src\SConscript" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters index c6acfdd6b3..311476bc72 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters @@ -54,7 +54,6 @@ </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> - <None Include="Src\SConscript" /> </ItemGroup> <ItemGroup> <Filter Include="ControllerInterface"> 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) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index d37d1eb2ba..08d62bcfc1 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -241,7 +241,7 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI { // each hat gets 4 input instances associated with it, (up down left right) for (u8 d = 0; d != 4; ++d) - AddInput(new Hat(i, m_state_in.rgdwPOV[m_index], d)); + AddInput(new Hat(i, m_state_in.rgdwPOV[i], d)); } // get up to 6 axes and 2 sliders |