From 9dd7b9d721f80600e938df6936f67a0f4178b6eb Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 2 Feb 2025 13:54:01 -0800
Subject: [PATCH] We need SDL 3.2.3 or newer for SDL_SoftStretch()
---
src/sdl2_compat.c | 2 +-
src/sdl3_include_wrapper.h | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index 1aaabab..2539ba3 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -318,7 +318,7 @@ static char loaderror[256];
#endif
#ifndef SDL3_REQUIRED_VER
-#define SDL3_REQUIRED_VER SDL_VERSIONNUM(3,2,0)
+#define SDL3_REQUIRED_VER SDL_VERSIONNUM(3,2,3)
#endif
#ifndef DIRSEP
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index c5591c5..1abe70f 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -942,7 +942,6 @@
#define SDL_ShowWindowSystemMenu IGNORE_THIS_VERSION_OF_SDL_ShowWindowSystemMenu
#define SDL_SignalCondition IGNORE_THIS_VERSION_OF_SDL_SignalCondition
#define SDL_SignalSemaphore IGNORE_THIS_VERSION_OF_SDL_SignalSemaphore
-#define SDL_SoftStretch IGNORE_THIS_VERSION_OF_SDL_SoftStretch
#define SDL_StartTextInput IGNORE_THIS_VERSION_OF_SDL_StartTextInput
#define SDL_StartTextInputWithProperties IGNORE_THIS_VERSION_OF_SDL_StartTextInputWithProperties
#define SDL_StepUTF8 IGNORE_THIS_VERSION_OF_SDL_StepUTF8
@@ -1266,6 +1265,7 @@
#define SDL_AudioStreamDevicePaused IGNORE_THIS_VERSION_OF_SDL_AudioStreamDevicePaused
#define SDL_ClickTrayEntry IGNORE_THIS_VERSION_OF_SDL_ClickTrayEntry
#define SDL_UpdateTrays IGNORE_THIS_VERSION_OF_SDL_UpdateTrays
+#define SDL_SoftStretch IGNORE_THIS_VERSION_OF_SDL_SoftStretch
#define SDL_FUNCTION_POINTER_IS_VOID_POINTER 1
@@ -1273,8 +1273,8 @@
#define __BUILDING_SDL2_COMPAT__ 1
#include <SDL3/SDL.h>
-#if !SDL_VERSION_ATLEAST(3,2,0)
-#error You need to compile against SDL >= 3.2.0 headers
+#if !SDL_VERSION_ATLEAST(3,2,3)
+#error You need to compile against SDL >= 3.2.3 headers
#endif
#define SDL_MAIN_HANDLED 1
@@ -4926,10 +4926,6 @@
#undef SDL_SignalSemaphore
#endif
-#ifdef SDL_SoftStretch
-#undef SDL_SoftStretch
-#endif
-
#ifdef SDL_StartTextInput
#undef SDL_StartTextInput
#endif
@@ -6222,6 +6218,10 @@
#undef SDL_UpdateTrays
#endif
+#ifdef SDL_SoftStretch
+#undef SDL_SoftStretch
+#endif
+
#undef SDL_ThreadID /* see at top. */
/* dump the macro CreateThread versions, too. */