From 21defbea953c36bba6eeec5ea6f7cf6d3cd310d8 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 4 Apr 2026 07:00:33 +1100 Subject: Fix up more stuff for upgraded tools, etc. docs: It's no longer possible to get a working Qt 5 setup with MSYS2, and there's no 32-bit Qt 6 package. Updated docs to reflect this. Use Qt 6 on Windows, use qmake to find moc. Fixed linking on Windows with static SDL3. input/input_dinput.cpp: Support SDL3. --- src/osd/modules/input/input_dinput.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/osd/modules/input/input_dinput.cpp') diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index 900aa4b8eec..5b2f99e7b01 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -1276,11 +1276,17 @@ std::pair, LPCDIDATAFORMAT> dinput_a window_handle = window.platform_window(); #elif defined(SDLMAME_WIN32) auto const sdlwindow = window.platform_window(); +#if SDL_VERSION_ATLEAST(3, 0, 0) + window_handle = reinterpret_cast(SDL_GetPointerProperty(SDL_GetWindowProperties(sdlwindow), SDL_PROP_WINDOW_WIN32_HWND_POINTER, nullptr)); + if (!window_handle) + return std::make_pair(nullptr, nullptr); +#else SDL_SysWMinfo info; SDL_VERSION(&info.version); if (!SDL_GetWindowWMInfo(sdlwindow, &info)) return std::make_pair(nullptr, nullptr); window_handle = info.info.win.window; +#endif #endif switch (cooperative_level) { -- cgit v1.2.3