mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
9eb76edabf
* [freetype2] Update to 2.11.1 * [harfbuzz] Update to 3.2.0 * [sdl2] Update to 2.0.20 * [ffmpeg] Update to 5.0 * Update versions. * [ffmpeg] Remove all avresample * Update ffmpeg.json * Update ffmpeg.json * Update ffmpeg.json * Revert "[ffmpeg] Update to 5.0" This reverts commit d4f718e882fe022f641b68e154e8cf64776c4143. * Revert "[ffmpeg] Remove all avresample" This reverts commit f1fecaa8cfa5b7f42fbef0897312028dc88b0ec8. * update * fix revert. * [sdl2] Fix uwp build. * Update sdl2.json
26 lines
759 B
Diff
26 lines
759 B
Diff
--- 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)
|
|
|