From dc1fca374e7af7ffd101725d8ce6f4da8f6d35e8 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Thu, 30 Jan 2025 12:07:26 +0800 Subject: [PATCH] Update lua-https to love2d/lua-https@5b6ecab. --- .../luahttps/src/android/AndroidClient.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libraries/luahttps/src/android/AndroidClient.cpp b/src/libraries/luahttps/src/android/AndroidClient.cpp index 2f11ecb09..6b6c74711 100644 --- a/src/libraries/luahttps/src/android/AndroidClient.cpp +++ b/src/libraries/luahttps/src/android/AndroidClient.cpp @@ -53,10 +53,17 @@ AndroidClient::AndroidClient() : HTTPSClient() { LibraryLoader::handle *library = LibraryLoader::GetCurrentProcessHandle(); - // Look for SDL_AndroidGetJNIEnv - LibraryLoader::LoadSymbol(SDL_AndroidGetJNIEnv, library, "SDL_AndroidGetJNIEnv"); - // Look for SDL_AndroidGetActivity - LibraryLoader::LoadSymbol(SDL_AndroidGetActivity, library, "SDL_AndroidGetActivity"); + + // Look for SDL_GetAndroidJNIEnv and SDL_GetAndroidActivity (SDL3) + if ( + !LibraryLoader::LoadSymbol(SDL_AndroidGetJNIEnv, library, "SDL_GetAndroidJNIEnv") && + !LibraryLoader::LoadSymbol(SDL_AndroidGetActivity, library, "SDL_GetAndroidActivity") + ) + { + // Probably running SDL2. + LibraryLoader::LoadSymbol(SDL_AndroidGetJNIEnv, library, "SDL_AndroidGetJNIEnv"); + LibraryLoader::LoadSymbol(SDL_AndroidGetActivity, library, "SDL_AndroidGetActivity"); + } } bool AndroidClient::valid() const