vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch

26 lines
759 B
Diff
Raw Normal View History

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1755,8 +1755,10 @@ elseif(WINDOWS)
list(APPEND EXTRA_LIBS dinput8)
endif()
if(HAVE_XINPUT_H)
- set(SDL_JOYSTICK_XINPUT 1)
- set(HAVE_XINPUT TRUE)
+ if(NOT WINDOWS_STORE)
+ set(SDL_JOYSTICK_XINPUT 1)
+ set(HAVE_XINPUT TRUE)
+ endif()
if(HAVE_WINDOWS_GAMING_INPUT_H)
set(SDL_JOYSTICK_WGI 1)
endif()
@@ -1764,7 +1766,7 @@ elseif(WINDOWS)
set(HAVE_SDL_JOYSTICK TRUE)
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)
if(HAVE_DINPUT_H)
set(SDL_HAPTIC_DINPUT 1)