From 3e41e389c5e4ecb4c624672a1dbbeaf0e7049f00 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 24 Apr 2025 21:53:03 +0300 Subject: [PATCH] engine: lib_common: do not take generic GNU/Linux rules for library naming on Android --- engine/common/lib_common.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/engine/common/lib_common.c b/engine/common/lib_common.c index 12f5b03c..89809661 100644 --- a/engine/common/lib_common.c +++ b/engine/common/lib_common.c @@ -128,9 +128,9 @@ dll_user_t *FS_FindLibrary( const char *dllname, qboolean directpath ) static void COM_GenerateCommonLibraryName( const char *name, const char *ext, char *out, size_t size ) { -#if ( XASH_WIN32 || XASH_LINUX || XASH_APPLE ) && XASH_X86 +#if ( XASH_WIN32 || ( XASH_LINUX && !XASH_ANDROID ) || XASH_APPLE ) && XASH_X86 Q_snprintf( out, size, "%s.%s", name, ext ); -#elif ( XASH_WIN32 || XASH_LINUX || XASH_APPLE ) +#elif XASH_WIN32 || ( XASH_LINUX && !XASH_ANDROID ) || XASH_APPLE Q_snprintf( out, size, "%s_%s.%s", name, Q_buildarch(), ext ); #else Q_snprintf( out, size, "%s_%s_%s.%s", name, Q_buildos(), Q_buildarch(), ext ); @@ -185,16 +185,12 @@ static void COM_GenerateServerLibraryPath( char *out, size_t size ) { #ifdef XASH_INTERNAL_GAMELIBS // assuming library loader knows where to get libraries Q_strncpy( out, "server", size ); -#elif ( XASH_WIN32 || XASH_LINUX || XASH_APPLE ) && XASH_X86 - -#if XASH_WIN32 +#elif XASH_X86 && XASH_WIN32 Q_strncpy( out, GI->game_dll, size ); -#elif XASH_APPLE +#elif XASH_X86 && XASH_APPLE Q_strncpy( out, GI->game_dll_osx, size ); -#else // XASH_LINUX +#elif XASH_X86 && XASH_LINUX && !XASH_ANDROID Q_strncpy( out, GI->game_dll_linux, size ); -#endif - #else string dllpath; const char *ext; @@ -203,7 +199,7 @@ static void COM_GenerateServerLibraryPath( char *out, size_t size ) Q_strncpy( dllpath, GI->game_dll, sizeof( dllpath ) ); #elif XASH_APPLE Q_strncpy( dllpath, GI->game_dll_osx, sizeof( dllpath ) ); -#else // XASH_APPLE +#else Q_strncpy( dllpath, GI->game_dll_linux, sizeof( dllpath ) ); #endif