From aeffe5eb8e7cf72321bdb53c26372bafd283ebfb Mon Sep 17 00:00:00 2001 From: rohlem Date: Fri, 10 Jan 2025 16:47:52 +0100 Subject: [PATCH 1/2] disable windows gaming input for mingw --- include/SDL_config_windows.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h index b360b963918d8..ac1069fba57b2 100644 --- a/include/SDL_config_windows.h +++ b/include/SDL_config_windows.h @@ -93,8 +93,10 @@ typedef unsigned int uintptr_t; #define HAVE_DXGI_H 1 #define HAVE_XINPUT_H 1 #if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0A00 /* Windows 10 SDK */ +#if !defined(__MINGW32__) /* in zig version 0.14.0-dev.2628+5b5c60f43, this header isn't found by default (I haven't looked further into it) */ #define HAVE_WINDOWS_GAMING_INPUT_H 1 #endif +#endif #if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0602 /* Windows 8 SDK */ #define HAVE_D3D11_H 1 #if !defined(_MSC_VER) From 68ca889b600c17c07c58035f46f942c2fb100b79 Mon Sep 17 00:00:00 2001 From: Jay Petacat Date: Fri, 10 Jan 2025 10:05:09 -0700 Subject: [PATCH 2/2] Update include/SDL_config_windows.h --- include/SDL_config_windows.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h index ac1069fba57b2..5d3503cd782ae 100644 --- a/include/SDL_config_windows.h +++ b/include/SDL_config_windows.h @@ -93,7 +93,7 @@ typedef unsigned int uintptr_t; #define HAVE_DXGI_H 1 #define HAVE_XINPUT_H 1 #if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0A00 /* Windows 10 SDK */ -#if !defined(__MINGW32__) /* in zig version 0.14.0-dev.2628+5b5c60f43, this header isn't found by default (I haven't looked further into it) */ +#if !defined(__MINGW32__) /* Header removed from Zig 0.14.0-dev in https://github.com/ziglang/zig/pull/22156 */ #define HAVE_WINDOWS_GAMING_INPUT_H 1 #endif #endif