From 4cc009ac3e4120fe833a842777eda1fe0e567f63 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 8 Aug 2025 16:15:58 +0500 Subject: [PATCH] engine: always prepend `lib` on Android, as it's part of library naming scheme now --- engine/common/filesystem_engine.c | 2 ++ engine/common/lib_common.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/engine/common/filesystem_engine.c b/engine/common/filesystem_engine.c index dcf0511b..fb46014b 100644 --- a/engine/common/filesystem_engine.c +++ b/engine/common/filesystem_engine.c @@ -142,6 +142,8 @@ static void FS_UnloadProgs( void ) #ifdef XASH_INTERNAL_GAMELIBS #define FILESYSTEM_STDIO_DLL "filesystem_stdio" +#elif XASH_ANDROID +#define FILESYSTEM_STDIO_DLL "libfilesystem_stdio.so" #else #define FILESYSTEM_STDIO_DLL "filesystem_stdio." OS_LIB_EXT #endif diff --git a/engine/common/lib_common.c b/engine/common/lib_common.c index f37d0369..afc50707 100644 --- a/engine/common/lib_common.c +++ b/engine/common/lib_common.c @@ -132,6 +132,8 @@ static void COM_GenerateCommonLibraryName( const char *name, const char *ext, ch Q_snprintf( out, size, "%s.%s", name, ext ); #elif XASH_WIN32 || ( XASH_LINUX && !XASH_ANDROID ) || XASH_APPLE Q_snprintf( out, size, "%s_%s.%s", name, Q_buildarch(), ext ); +#elif XASH_ANDROID + Q_snprintf( out, size, "lib%s_android_%s.so", name, Q_buildarch() ); #else Q_snprintf( out, size, "%s_%s_%s.%s", name, Q_buildos(), Q_buildarch(), ext ); #endif