Merge pull request #5118 from slendidev/sdl3fixes
Some checks failed
Android / build (arm64) (push) Has been cancelled
Android / build (x86_64) (push) Has been cancelled
CMakeBuilds / Windows Build (push) Has been cancelled
CMakeBuilds / Linux Build (push) Has been cancelled
Linux / build (aarch64, arm64, /usr/bin, 64, ubuntu-24.04-arm) (push) Has been cancelled
Linux / build (i386, i386, /usr/bin, 32, ubuntu-latest) (push) Has been cancelled
Linux / build (x86_64, amd64, /usr/bin, 64, ubuntu-latest) (push) Has been cancelled
Linux Examples / build (push) Has been cancelled
macOS / build (push) Has been cancelled
WebAssembly / build (push) Has been cancelled
Windows / build (ARM64, ARM64, msvc16, winarm64) (push) Has been cancelled
Windows / build (i686, pe-i386, mingw-w64, win32) (push) Has been cancelled
Windows / build (x64, x64, msvc16, win64) (push) Has been cancelled
Windows / build (x86, Win32, msvc16, win32) (push) Has been cancelled
Windows / build (x86_64, pe-x86-64, mingw-w64, win64) (push) Has been cancelled
Windows Examples / build (push) Has been cancelled

Fix SDL3 build if using package
This commit is contained in:
Ray 2025-08-17 21:35:35 +02:00 committed by GitHub
commit 284d9ddd89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -48,7 +48,9 @@
*
**********************************************************************************************/
#ifdef USING_SDL3_PACKAGE
#define USING_SDL3_PROJECT
#endif
#ifndef SDL_ENABLE_OLD_NAMES
#define SDL_ENABLE_OLD_NAMES // Just in case we're on SDL3, we need some in-between compatibily
#endif
@ -1620,7 +1622,7 @@ void PollInputEvents(void)
// Add character (codepoint) to the queue
#if defined(PLATFORM_DESKTOP_SDL3)
unsigned int textLen = strlen(event.text.text);
unsigned int codepoint = (unsigned int)SDL_StepUTF8(&event.text.text, textLen);
unsigned int codepoint = (unsigned int)SDL_StepUTF8(&event.text.text, &textLen);
#else
int codepointSize = 0;
int codepoint = GetCodepointNextSDL(event.text.text, &codepointSize);