mirror of https://github.com/encounter/SDL.git
cmake: fix UWP joystick.
from: https://github.com/microsoft/vcpkg/blob/master/ports/sdl2/0005-Fix-uwp-joystick.patch
This commit is contained in:
parent
c93e552068
commit
b5614d0c6e
|
@ -1783,8 +1783,10 @@ elseif(WINDOWS)
|
||||||
list(APPEND EXTRA_LIBS dinput8)
|
list(APPEND EXTRA_LIBS dinput8)
|
||||||
endif()
|
endif()
|
||||||
if(HAVE_XINPUT_H)
|
if(HAVE_XINPUT_H)
|
||||||
set(SDL_JOYSTICK_XINPUT 1)
|
if(NOT WINDOWS_STORE)
|
||||||
set(HAVE_XINPUT TRUE)
|
set(SDL_JOYSTICK_XINPUT 1)
|
||||||
|
set(HAVE_XINPUT TRUE)
|
||||||
|
endif()
|
||||||
if(HAVE_WINDOWS_GAMING_INPUT_H)
|
if(HAVE_WINDOWS_GAMING_INPUT_H)
|
||||||
set(SDL_JOYSTICK_WGI 1)
|
set(SDL_JOYSTICK_WGI 1)
|
||||||
endif()
|
endif()
|
||||||
|
@ -1792,7 +1794,7 @@ elseif(WINDOWS)
|
||||||
set(HAVE_SDL_JOYSTICK TRUE)
|
set(HAVE_SDL_JOYSTICK TRUE)
|
||||||
|
|
||||||
if(SDL_HAPTIC)
|
if(SDL_HAPTIC)
|
||||||
if(HAVE_DINPUT_H OR HAVE_XINPUT_H)
|
if((HAVE_DINPUT_H OR HAVE_XINPUT_H) AND NOT WINDOWS_STORE)
|
||||||
file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/windows/*.c)
|
file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/windows/*.c)
|
||||||
if(HAVE_DINPUT_H)
|
if(HAVE_DINPUT_H)
|
||||||
set(SDL_HAPTIC_DINPUT 1)
|
set(SDL_HAPTIC_DINPUT 1)
|
||||||
|
|
Loading…
Reference in New Issue