piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #343 from jordan-woyak/disable-sdl-windows

Browse Source 
Disable SDL input on Windows.
This commit is contained in:
shuffle2
2014-05-21 19:47:44 -07:00
parent 36d4874325 635dbd0ff9
commit dd413269e3
145 changed files with 11 additions and 51799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -37,9 +37,6 @@ if(NOT ANDROID)
if(SDL_FOUND)
# Using shared SDL
set(LIBS ${LIBS} ${SDL_LIBRARY})
else(SDL_FOUND)
# Using static SDL from Externals
set(LIBS ${LIBS} SDL)
endif()
endif()
else()

7
Source/Core/InputCommon/CMakeLists.txt
View File

@ -11,7 +11,6 @@ if(WIN32)
ControllerInterface/DInput/DInput.cpp
ControllerInterface/DInput/DInputJoystick.cpp
ControllerInterface/DInput/DInputKeyboardMouse.cpp
ControllerInterface/SDL/SDL.cpp
ControllerInterface/XInput/XInput.cpp
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@ -19,11 +18,9 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
ControllerInterface/OSX/OSX.mm
ControllerInterface/OSX/OSXKeyboard.mm
ControllerInterface/OSX/OSXJoystick.mm
ControllerInterface/SDL/SDL.cpp
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
elseif(X11_FOUND)
set(SRCS ${SRCS}
ControllerInterface/SDL/SDL.cpp
ControllerInterface/Xlib/Xlib.cpp)
if(XINPUT2_FOUND)
set(SRCS ${SRCS}
@ -34,4 +31,8 @@ elseif(ANDROID)
ControllerInterface/Android/Android.cpp)
endif()
if(SDL_FOUND OR SDL2_FOUND)
set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
endif()
add_dolphin_library(inputcommon "${SRCS}" "")

5
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View File

@ -19,11 +19,9 @@
#ifdef _WIN32
#define CIFACE_USE_XINPUT
#define CIFACE_USE_DINPUT
#define CIFACE_USE_SDL
#endif
#if defined(HAVE_X11) && HAVE_X11
#define CIFACE_USE_XLIB
#define CIFACE_USE_SDL
#if defined(HAVE_X11_XINPUT2) && HAVE_X11_XINPUT2
#define CIFACE_USE_X11_XINPUT2
#endif
@ -34,6 +32,9 @@
#ifdef ANDROID
#define CIFACE_USE_ANDROID
#endif
#if defined(HAVE_SDL) && HAVE_SDL
#define CIFACE_USE_SDL
#endif
using namespace ciface::Core;

2
Source/Core/InputCommon/InputCommon.vcxproj
View File

@ -51,7 +51,6 @@
<ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
<ClCompile Include="ControllerInterface\ExpressionParser.cpp" />
<ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" />
<ClCompile Include="ControllerInterface\SDL\SDL.cpp" />
<ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
<ClCompile Include="InputConfig.cpp" />
<ClCompile Include="stdafx.cpp">
@ -69,7 +68,6 @@
<ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h" />
<ClInclude Include="ControllerInterface\ExpressionParser.h" />
<ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" />
<ClInclude Include="ControllerInterface\SDL\SDL.h" />
<ClInclude Include="ControllerInterface\XInput\XInput.h" />
<ClInclude Include="GCPadStatus.h" />
<ClInclude Include="InputConfig.h" />

9
Source/Core/InputCommon/InputCommon.vcxproj.filters
View File

@ -7,9 +7,6 @@
<Filter Include="ControllerInterface\DInput">
<UniqueIdentifier>{0289ef91-50f5-4c16-9fa4-ff4c4d8208e7}</UniqueIdentifier>
</Filter>
<Filter Include="ControllerInterface\SDL">
<UniqueIdentifier>{770bf6f3-b0c3-4731-be52-46f54b4cb319}</UniqueIdentifier>
</Filter>
<Filter Include="ControllerInterface\XInput">
<UniqueIdentifier>{07bad1aa-7e03-4f5c-ade2-a44857c5cbc3}</UniqueIdentifier>
</Filter>
@ -34,9 +31,6 @@
<ClCompile Include="ControllerInterface\XInput\XInput.cpp">
<Filter>ControllerInterface\XInput</Filter>
</ClCompile>
<ClCompile Include="ControllerInterface\SDL\SDL.cpp">
<Filter>ControllerInterface\SDL</Filter>
</ClCompile>
<ClCompile Include="ControllerInterface\Device.cpp">
<Filter>ControllerInterface</Filter>
</ClCompile>
@ -69,9 +63,6 @@
<ClInclude Include="ControllerInterface\XInput\XInput.h">
<Filter>ControllerInterface\XInput</Filter>
</ClInclude>
<ClInclude Include="ControllerInterface\SDL\SDL.h">
<Filter>ControllerInterface\SDL</Filter>
</ClInclude>
<ClInclude Include="ControllerInterface\ControllerInterface.h">
<Filter>ControllerInterface</Filter>
</ClInclude>