Skip to content

sdl: Update to 3.4.10 #120373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nintorch wants to merge 3 commits into
base: master
Choose a base branch
from
Open

sdl: Update to 3.4.10 #120373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8733597
sdl: Update to 3.4.10
Nintorch Jun 17, 2026
add9702
Test
Nintorch Jun 18, 2026
f804a90
Include SDL filesystem
Nintorch Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions drivers/sdl/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ if env["builtin_sdl"]:
"libm/s_scalbn.c",
"libm/s_sin.c",
"libm/s_tan.c",
"misc/SDL_libusb.c",
"sensor/SDL_sensor.c",
"sensor/dummy/SDL_dummysensor.c",
"stdlib/SDL_crc16.c",
Expand All @@ -95,25 +96,36 @@ if env["builtin_sdl"]:

# HIDAPI
thirdparty_sources += [
"haptic/hidapi/SDL_hidapihaptic_lg4ff.c",
"haptic/hidapi/SDL_hidapihaptic.c",
"hidapi/SDL_hidapi.c",
"joystick/hidapi/SDL_hidapi_8bitdo.c",
"joystick/hidapi/SDL_hidapi_combined.c",
"joystick/hidapi/SDL_hidapi_flydigi.c",
"joystick/hidapi/SDL_hidapi_gamecube.c",
"joystick/hidapi/SDL_hidapijoystick.c",
"joystick/hidapi/SDL_hidapi_gip.c",
"joystick/hidapi/SDL_hidapi_lg4ff.c",
"joystick/hidapi/SDL_hidapi_luna.c",
"joystick/hidapi/SDL_hidapi_ps3.c",
"joystick/hidapi/SDL_hidapi_ps4.c",
"joystick/hidapi/SDL_hidapi_ps5.c",
"joystick/hidapi/SDL_hidapi_rumble.c",
"joystick/hidapi/SDL_hidapi_shield.c",
"joystick/hidapi/SDL_hidapi_sinput.c",
"joystick/hidapi/SDL_hidapi_stadia.c",
"joystick/hidapi/SDL_hidapi_steam.c",
"joystick/hidapi/SDL_hidapi_steamdeck.c",
"joystick/hidapi/SDL_hidapi_steam_hori.c",
"joystick/hidapi/SDL_hidapi_steam_triton.c",
"joystick/hidapi/SDL_hidapi_switch.c",
"joystick/hidapi/SDL_hidapi_switch2.c",
"joystick/hidapi/SDL_hidapi_wii.c",
"joystick/hidapi/SDL_hidapi_xbox360.c",
"joystick/hidapi/SDL_hidapi_xbox360w.c",
"joystick/hidapi/SDL_hidapi_xboxone.c",
"joystick/hidapi/SDL_hidapi_zuiki.c",
"joystick/hidapi/SDL_hidapijoystick.c",
"joystick/hidapi/SDL_report_descriptor.c",
]

# Platform specific sources.
Expand Down Expand Up @@ -163,7 +175,6 @@ if env["builtin_sdl"]:
elif env["platform"] == "windows":
env_sdl.Append(CPPDEFINES=["SDL_PLATFORM_WINDOWS"])
thirdparty_sources += [
"core/windows/SDL_gameinput.c",
"core/windows/SDL_hid.c",
"core/windows/SDL_immdevice.c",
"core/windows/SDL_windows.c",
Expand Down
2 changes: 2 additions & 0 deletions drivers/sdl/SDL_build_config_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
#define SDL_PLATFORM_PRIVATE_NAME "macOS"
#define SDL_PLATFORM_UNIX 1
#define HAVE_STDIO_H 1
#define HAVE_STDLIB_H 1
#define HAVE_LIBC 1
#define SDL_HAPTIC_IOKIT 1
#define SDL_JOYSTICK_IOKIT 1
Expand All @@ -144,6 +145,7 @@
#define SDL_PLATFORM_UNIX 1

#define HAVE_STDIO_H 1
#define HAVE_STDLIB_H 1

@Nintorch Nintorch Jun 17, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required for the definition of SDL_abort()

#define HAVE_LIBC 1

#define SDL_JOYSTICK_MFI 1
Expand Down
4 changes: 1 addition & 3 deletions thirdparty/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,9 +1017,7 @@ Patches:
- `0004-errno-include.patch` ([GH-108354](https://github.com/godotengine/godot/pull/108354))
- `0005-fix-libudev-dbus.patch` ([GH-108373](https://github.com/godotengine/godot/pull/108373))
- `0006-fix-cs-environ.patch` ([GH-109283](https://github.com/godotengine/godot/pull/109283))
- `0007-shield-duplicate-macos.patch` ([GH-115510](https://github.com/godotengine/godot/pull/115510))
- `0008-fix-linux-joycon-serial-num.patch` ([GH-113873](https://github.com/godotengine/godot/pull/113873))
- `0009-update-device-blocklist.patch` ([GH-119403](https://github.com/godotengine/godot/pull/119403))
- `0010-fix-filesystem-usage.patch` ([GH-120373](https://github.com/godotengine/godot/pull/120373))


## spirv-cross
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/sdl/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 1997-2025 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2026 Sam Lantinga <slouken@libsdl.org>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
Loading
Loading