From 478ba6bc8656c77c45a92913dfce03021f8eab3f Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 17 Oct 2024 22:21:50 +0300
Subject: [PATCH] minor sync with latest SDL3.
---
src/sdl2_compat.c | 6 ++++++
src/sdl3_include_wrapper.h | 5 +++++
src/sdl3_syms.h | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index 7886860e..9eefb94e 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -9623,6 +9623,12 @@ SDL_IsAndroidTV(void)
{
return SDL3_IsTV() ? SDL2_TRUE : SDL2_FALSE;
}
+
+SDL_DECLSPEC void * SDLCALL
+SDL_AndroidGetJNIEnv(void)
+{
+ return SDL3_GetAndroidJNIEnv();
+}
#endif
#ifdef __cplusplus
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index fd46f147..a30d8ce5 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -1214,6 +1214,7 @@
#define SDL_SetErrorV IGNORE_THIS_VERSION_OF_SDL_SetErrorV
#define SDL_GetDefaultLogOutputFunction IGNORE_THIS_VERSION_OF_SDL_GetDefaultLogOutputFunction
#define SDL_RenderDebugText IGNORE_THIS_VERSION_OF_SDL_RenderDebugText
+#define SDL_GetSandbox IGNORE_THIS_VERSION_OF_SDL_GetSandbox
#define SDL_FUNCTION_POINTER_IS_VOID_POINTER 1
@@ -5962,6 +5963,10 @@
#undef SDL_RenderDebugText
#endif
+#ifdef SDL_GetSandbox
+#undef SDL_GetSandbox
+#endif
+
#undef SDL_ThreadID /* see at top. */
/* dump the macro CreateThread versions, too. */
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index c8f54906..08eed3f0 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -87,7 +87,7 @@ SDL3_SYM_RENAMED_RETCODE(bool,LinuxSetThreadPriorityAndPolicy,SetLinuxThreadPrio
#endif
#ifdef SDL_PLATFORM_ANDROID
-SDL3_SYM_RENAMED(void*,AndroidGetJNIEnv,GetAndroidJNIEnv,(void),(),return)
+SDL3_SYM(JNIEnv*,GetAndroidJNIEnv,(void),(),return)
SDL3_SYM_RENAMED(void*,AndroidGetActivity,GetAndroidActivity,(void),(),return)
SDL3_SYM_RENAMED(const char*,AndroidGetInternalStoragePath,GetAndroidInternalStoragePath,(void),(),return)
SDL3_SYM(Uint32,GetAndroidExternalStorageState,(void),(),return)