You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-12-30 18:30:54 +00:00
Merge pull request #113968 from akien-mga/sdl-3.2.28
sdl: Update to 3.2.28
This commit is contained in:
@@ -56,19 +56,6 @@ JoypadSDL::JoypadSDL() {
|
||||
singleton = this;
|
||||
}
|
||||
|
||||
#ifdef WINDOWS_ENABLED
|
||||
extern "C" {
|
||||
HWND SDL_HelperWindow;
|
||||
}
|
||||
|
||||
// Required for DInput joypads to work
|
||||
// TODO: remove this workaround when we update to newer version of SDL
|
||||
JoypadSDL::JoypadSDL(HWND p_helper_window) :
|
||||
JoypadSDL() {
|
||||
SDL_HelperWindow = p_helper_window;
|
||||
}
|
||||
#endif
|
||||
|
||||
JoypadSDL::~JoypadSDL() {
|
||||
// Process any remaining input events
|
||||
process_events();
|
||||
|
||||
@@ -34,16 +34,12 @@
|
||||
#include "core/os/thread.h"
|
||||
|
||||
typedef uint32_t SDL_JoystickID;
|
||||
typedef struct HWND__ *HWND;
|
||||
typedef struct SDL_Joystick SDL_Joystick;
|
||||
typedef struct SDL_Gamepad SDL_Gamepad;
|
||||
|
||||
class JoypadSDL {
|
||||
public:
|
||||
JoypadSDL();
|
||||
#ifdef WINDOWS_ENABLED
|
||||
JoypadSDL(HWND p_helper_window);
|
||||
#endif
|
||||
~JoypadSDL();
|
||||
|
||||
static JoypadSDL *get_singleton();
|
||||
|
||||
Reference in New Issue
Block a user