android: set requestLegacyExternalStorage specifically for Android 10 which didn't had MANAGE_EXTERNAL_STORAGE yet

This reverts commit c1c0c2761d.

Documentation/extensions/library-naming.md

@@ -42,3 +42,6 @@ Issue #3: Some mods (like The Specialists, Tyrian, ...) already apply suffixes _
 Resolution: On x86 on **Win/Lin/Mac**, don't change anything. Otherwise, strip the _i?86 part and follow the usual scheme.
 
 See discussion: https://github.com/FWGS/xash3d-fwgs/issues/39
+
+Issue #4: When distributing game libraries on Android inside an APK, they couldn't be loaded.
+Resolution: Enable `useLegacyPackaging` option in build.gradle, when distributing games in APK. Always force game libraries to have `lib` prefix on Android, regardless if they are packaged in APK or not..

android/app/build.gradle.kts

@@ -23,7 +23,7 @@ android {
 		externalNativeBuild {
 			val engineRoot = projectDir.parentFile.parent
 
-			experimentalProperties["ninja.abiFilters"] = setOf("armeabi-v7a", "arm64-v8a")
+			experimentalProperties["ninja.abiFilters"] = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 			experimentalProperties["ninja.path"] = File(engineRoot, "wscript").path
 			experimentalProperties["ninja.configure"] = "run-python"
 			experimentalProperties["ninja.arguments"] = setOf(
@@ -62,13 +62,16 @@ android {
 		abortOnError = false
 	}
 
+/*
 	androidResources {
 		noCompress += ""
 	}
+*/
 
 	packaging {
 		jniLibs {
 			keepDebugSymbols.add("**/*.so")
+			useLegacyPackaging = true
 		}
 	}
 

android/app/src/main/AndroidManifest.xml

@@ -57,7 +57,8 @@
 		android:label="@string/app_name"
 		android:roundIcon="@mipmap/ic_launcher"
 		android:theme="@style/Theme.App"
-		android:usesCleartextTraffic="true">
+		android:usesCleartextTraffic="true"
+		android:requestLegacyExternalStorage="true">
 		<activity
 			android:name=".MainActivity"
 			android:exported="true">
@@ -80,4 +81,9 @@
 			</intent-filter>
 		</activity>
 	</application>
+	<queries>
+		<intent>
+			<action android:name="su.xash.engine.MOD" />
+		</intent>
+	</queries>
 </manifest>

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
@@ -332,6 +334,7 @@ void FS_Init( const char *basedir )
 	Cvar_RegisterVariable( &fs_mount_lv );
 	Cvar_RegisterVariable( &fs_mount_addon );
 	Cvar_RegisterVariable( &fs_mount_l10n );
+	Cvar_RegisterVariable( &ui_language );
 
 	if( !Sys_GetParmFromCmdLine( "-dll", host.gamedll ))
 		host.gamedll[0] = 0;

engine/common/host.c

@@ -1146,6 +1146,10 @@ static void Host_InitCommon( int argc, char **argv, const char *progname, qboole
 	Cmd_AddCommand( "memlist", Host_MemStats_f, "prints memory pool information" );
 	Cmd_AddRestrictedCommand( "userconfigd", Host_Userconfigd_f, "execute all scripts from userconfig.d" );
 
+#if !XASH_DEDICATED
+	Cmd_AddRestrictedCommand( "host_writeconfig", Host_WriteConfig, "save current configuration" );
+#endif
+
 	Image_Init();
 	Sound_Init();
 

engine/common/imagelib/img_main.c

@@ -17,6 +17,9 @@ GNU General Public License for more details.
 #include "imagelib.h"
 #include "eiface.h" // ARRAYSIZE
 
+#define DEBUG_LOOKUPS_COUNT 0
+#define USE_FS_SEARCH_FOR_LOOKUPS 1
+
 // global image variables
 imglib_t	image;
 
@@ -87,6 +90,45 @@ const bpc_desc_t PFDesc[] =
 { PF_ATI2,	"ATI 2",	0x8837, 4 },
 };
 
+#if DEBUG_LOOKUPS_COUNT
+static int g_lookups = 0;
+static int g_lookups_total = 0;
+static double g_lookup_start = 0.0f;
+static double g_lookup_time = 0.0f;
+static double g_lookup_time_total = 0.0f;
+
+static void Image_ReportLookupsCount( const char *name )
+{
+	if( name[0] != '#' )
+	{
+		Con_Reportf( "Performed %i lookups in %fs (of total %i for %fs) while loading %s\n",
+			g_lookups, g_lookup_time, g_lookups_total, g_lookup_time_total, name );
+	}
+}
+
+static void Image_IncrementLookupTime( void )
+{
+	double t = Sys_DoubleTime();
+	double dt = t - g_lookup_start;
+
+	g_lookup_time += dt;
+	g_lookup_time_total += dt;
+	g_lookups++;
+	g_lookups_total++;
+
+	g_lookup_start = Sys_DoubleTime();
+}
+#else
+static void Image_ReportLookupsCount( const char *name )
+{
+	(void)name;
+}
+static void Image_IncrementLookupTime( void )
+{
+
+}
+#endif
+
 void Image_Reset( void )
 {
 	// reset global variables
@@ -108,12 +150,20 @@ void Image_Reset( void )
 	image.rgba = NULL;
 	image.ptr = 0;
 	image.size = 0;
+
+#if DEBUG_LOOKUPS_COUNT
+	g_lookups = 0;
+	g_lookup_time = 0.0f;
+	g_lookup_start = Sys_DoubleTime();
+#endif // DEBUG_LOOKUPS_COUNT
 }
 
-static MALLOC_LIKE( FS_FreeImage, 1 ) rgbdata_t *ImagePack( void )
+static MALLOC_LIKE( FS_FreeImage, 1 ) rgbdata_t *ImagePack( const char *name )
 {
 	rgbdata_t	*pack;
 
+	Image_ReportLookupsCount( name );
+
 	// clear any force flags
 	image.force_flags = 0;
 
@@ -231,7 +281,7 @@ static qboolean Image_ProbeLoadBuffer_( const loadpixformat_t *fmt, const char *
 
 static qboolean Image_ProbeLoadBuffer( const loadpixformat_t *fmt, const char *name, const byte *buf, size_t size, int override_hint )
 {
-	if( size <= 0 )
+	if( unlikely( size <= 0 ))
 		return false;
 
 	// bruteforce all loaders
@@ -259,9 +309,11 @@ static qboolean Image_ProbeLoad_( const loadpixformat_t *fmt, const char *name,
 	Q_snprintf( path, sizeof( path ), "%s%s.%s", name, suffix, fmt->ext );
 	f = FS_LoadFile( path, &filesize, false );
 
-	if( f )
+	Image_IncrementLookupTime();
+
+	if( f && filesize >= 0 )
 	{
-		success = Image_ProbeLoadBuffer( fmt, path, f, filesize, override_hint );
+		success = Image_ProbeLoadBuffer_( fmt, path, f, filesize, override_hint );
 
 		Mem_Free( f );
 	}
@@ -269,10 +321,65 @@ static qboolean Image_ProbeLoad_( const loadpixformat_t *fmt, const char *name,
 	return success;
 }
 
+static qboolean Image_ProbeLoad2( const char *name, const char *suffix, int override_hint )
+{
+	const loadpixformat_t *fmt;
+	search_t *t;
+	string pattern;
+	int i;
+
+	Q_snprintf( pattern, sizeof( pattern ), "%s%s.*", name, suffix );
+
+	t = FS_Search( pattern, true, false );
+
+	if( !t )
+		return false;
+
+	// we now have to check every extension
+	// to keep the loading order
+	for( fmt = image.loadformats; fmt->ext; fmt++ )
+	{
+		fs_offset_t filesize;
+		byte *data;
+
+		for( i = 0; i < t->numfilenames; i++ )
+		{
+			const char *ext = COM_FileExtension( t->filenames[i] );
+
+			if( !Q_stricmp( ext, fmt->ext ))
+				break;
+		}
+
+		// try next...
+		if( i == t->numfilenames )
+			continue;
+
+		data = FS_LoadFile( t->filenames[i], &filesize, false );
+		Image_IncrementLookupTime();
+
+		// can't load file, ignore
+		if( unlikely( !data || filesize <= 0 ))
+			continue;
+
+		if( Image_ProbeLoadBuffer_( fmt, t->filenames[i], data, filesize, override_hint ))
+		{
+			Mem_Free( data );
+			Mem_Free( t );
+			return true;
+		}
+	}
+
+	Mem_Free( t );
+	return false;
+}
+
 static qboolean Image_ProbeLoad( const loadpixformat_t *fmt, const char *name, const char *suffix, int override_hint )
 {
 	if( !fmt )
 	{
+#if USE_FS_SEARCH_FOR_LOOKUPS
+		return Image_ProbeLoad2( name, suffix, override_hint );
+#else
 		// bruteforce all formats to allow implicit extension
 		for( fmt = image.loadformats; fmt->ext; fmt++ )
 		{
@@ -281,6 +388,7 @@ static qboolean Image_ProbeLoad( const loadpixformat_t *fmt, const char *name, c
 		}
 
 		return false;
+#endif
 	}
 
 	return Image_ProbeLoad_( fmt, name, suffix, override_hint );
@@ -301,19 +409,20 @@ rgbdata_t *FS_LoadImage( const char *filename, const byte *buffer, size_t size )
 	const loadpixformat_t *extfmt;
 
 	Q_strncpy( loadname, filename, sizeof( loadname ));
-	Image_Reset(); // clear old image
 
 	// we needs to compare file extension with list of supported formats
 	// and be sure what is real extension, not a filename with dot
 	if(( extfmt = Image_GetLoadFormatForExtension( ext )))
 		COM_StripExtension( loadname );
 
+	Image_Reset(); // clear old image
+
 	// special mode: skip any checks, load file from buffer
 	if( filename[0] == '#' && buffer && size )
 		goto load_internal;
 
 	if( Image_ProbeLoad( extfmt, loadname, "", -1 ))
-		return ImagePack();
+		return ImagePack( filename );
 
 	// check all cubemap sides with package suffix
 	for( j = 0; j < ARRAYSIZE( load_cubemap ); j++ )
@@ -351,17 +460,20 @@ rgbdata_t *FS_LoadImage( const char *filename, const byte *buffer, size_t size )
 	}
 
 	if( image.cubemap )
-		return ImagePack(); // all done
+		return ImagePack( filename ); // all done
 
 load_internal:
 	if( buffer && size )
 	{
 		if( Image_ProbeLoadBuffer( extfmt, loadname, buffer, size, -1 ))
-			return ImagePack();
+			return ImagePack( filename );
 	}
 
 	if( loadname[0] != '#' )
+	{
 		Con_Reportf( S_WARN "%s: couldn't load \"%s\"\n", __func__, loadname );
+		Image_ReportLookupsCount( filename );
+	}
 
 	// clear any force flags
 	image.force_flags = 0;
@@ -605,7 +717,7 @@ int EXPORT export( const uint8_t *Data, size_t Size ) \
 	Image_Init(); \
 	if( target( "#internal", Data, Size )) \
 	{ \
-		rgb = ImagePack(); \
+		rgb = ImagePack( "#internal" ); \
 		FS_FreeImage( rgb ); \
 	} \
 	Image_Shutdown(); \

engine/common/lib_common.c

@@ -151,8 +151,11 @@ static void COM_GenerateClientLibraryPath( const char *name, char *out, size_t s
 #else
 	string dllpath;
 
-	// we don't have any library prefixes, so we can safely append dll_path here
+#if XASH_ANDROID
+	Q_snprintf( dllpath, sizeof( dllpath ), "%s/lib%s", GI->dll_path, name );
+#else
 	Q_snprintf( dllpath, sizeof( dllpath ), "%s/%s", GI->dll_path, name );
+#endif
 
 	COM_GenerateCommonLibraryName( dllpath, OS_LIB_EXT, out, size );
 #endif
@@ -181,7 +184,7 @@ COM_GenerateServerLibraryPath
 Generates platform-unique and compatible name for server library
 ==============
 */
-static void COM_GenerateServerLibraryPath( char *out, size_t size )
+static void COM_GenerateServerLibraryPath( const char *alt_dllname, char *out, size_t size )
 {
 #ifdef XASH_INTERNAL_GAMELIBS // assuming library loader knows where to get libraries
 	Q_strncpy( out, "server", size );
@@ -192,21 +195,42 @@ static void COM_GenerateServerLibraryPath( char *out, size_t size )
 #elif XASH_X86 && XASH_LINUX && !XASH_ANDROID
 	Q_strncpy( out, GI->game_dll_linux, size );
 #else
-	string dllpath;
+	string temp, dir, dllpath, ext;
-	const char *ext;
+	const char *dllname;
 
 #if XASH_WIN32
-	Q_strncpy( dllpath, GI->game_dll, sizeof( dllpath ) );
+	Q_strncpy( temp, GI->game_dll, sizeof( temp ));
 #elif XASH_APPLE
-	Q_strncpy( dllpath, GI->game_dll_osx, sizeof( dllpath ) );
+	Q_strncpy( temp, GI->game_dll_osx, sizeof( temp ));
 #else
-	Q_strncpy( dllpath, GI->game_dll_linux, sizeof( dllpath ) );
+	Q_strncpy( temp, GI->game_dll_linux, sizeof( temp ));
 #endif
 
-	ext = COM_FileExtension( dllpath );
+	// path to the dll directory
-	COM_StripExtension( dllpath );
+	COM_ExtractFilePath( temp, dir );
-	COM_StripIntelSuffix( dllpath );
 
+	if( alt_dllname )
+	{
+		dllname = alt_dllname;
+		Q_strncpy( ext, OS_LIB_EXT, sizeof( ext ));
+	}
+	else
+	{
+		// cleaned up dll name
+		Q_strncpy( ext, COM_FileExtension( temp ), sizeof( ext ));
+		COM_StripExtension( temp );
+		COM_StripIntelSuffix( temp );
+		dllname = COM_FileWithoutPath( temp );
+	}
+
+	// add `lib` prefix if required by platform
+#if XASH_ANDROID
+	Q_snprintf( dllpath, sizeof( dllpath ), "%s/lib%s", dir, dllname );
+#else
+	Q_snprintf( dllpath, sizeof( dllpath ), "%s/%s", dir, dllname );
+#endif
+
+	// and finally add platform suffix
 	COM_GenerateCommonLibraryName( dllpath, ext, out, size );
 #endif
 }
@@ -245,10 +269,10 @@ void COM_GetCommonLibraryPath( ECommonLibraryType eLibType, char *out, size_t si
 		if( COM_CheckStringEmpty( host.gamedll ))
 		{
 			if( host.gamedll[0] == '@' )
-				COM_GenerateClientLibraryPath( host.gamedll + 1, out, size );
+				COM_GenerateServerLibraryPath( host.gamedll + 1, out, size );
 			else Q_strncpy( out, host.gamedll, size );
 		}
-		else COM_GenerateServerLibraryPath( out, size );
+		else COM_GenerateServerLibraryPath( NULL, out, size );
 		break;
 	default:
 		ASSERT( 0 );

engine/common/sys_con.c

@@ -238,7 +238,7 @@ static void Sys_PrintStdout( const char *logtime, size_t logtime_len, const char
 
 	// platform-specific output
 #if XASH_ANDROID && !XASH_DEDICATED
-	__android_log_write( ANDROID_LOG_DEBUG, "Xash", buf );
+	__android_log_write( ANDROID_LOG_INFO, "Xash", buf );
 #endif // XASH_ANDROID && !XASH_DEDICATED
 
 #if TARGET_OS_IOS

engine/platform/android/lib_android.c

@@ -41,7 +41,10 @@ void *ANDROID_LoadLibrary( const char *path )
 		handle = dlopen( fullpath, RTLD_NOW );
 
 		if( handle )
+		{
+			Con_Reportf( "%s: loading library %s successful\n", __func__, fullpath );
 			return handle;
+		}
 
 		COM_PushLibraryError( dlerror() );
 	}
@@ -49,7 +52,10 @@ void *ANDROID_LoadLibrary( const char *path )
 	// find in system search path, that includes our APK
 	handle = dlopen( name, RTLD_NOW );
 	if( handle )
+	{
+		Con_Reportf( "%s: loading library %s from LD_LIBRARY_PATH successful\n", __func__, name );
 		return handle;
+	}
 	COM_PushLibraryError( dlerror() );
 
 	return NULL;

engine/platform/platform.h

@@ -17,6 +17,7 @@ GNU General Public License for more details.
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
+#include <errno.h>
 #include "common.h"
 #include "system.h"
 #include "defaults.h"
@@ -181,7 +182,10 @@ static inline qboolean Platform_NanoSleep( int nsec )
 		.tv_sec = 0,
 		.tv_nsec = nsec, // just don't put large numbers here
 	};
-	return nanosleep( &ts, NULL ) == 0;
+	int ret = nanosleep( &ts, NULL );
+	if( ret < 0 )
+		return errno == EINTR; // ignore EINTR error, it just means sleep was interrupted
+	return true;
 #elif XASH_WIN32
 	return Win32_NanoSleep( nsec );
 #else

engine/platform/sdl2/vid_sdl2.c

@@ -894,6 +894,7 @@ int GL_SetAttribute( int attr, int val )
 		MAP_REF_API_ATTRIBUTE_TO_SDL( GL_SHARE_WITH_CURRENT_CONTEXT );
 		MAP_REF_API_ATTRIBUTE_TO_SDL( GL_FRAMEBUFFER_SRGB_CAPABLE );
 	case REF_GL_CONTEXT_PROFILE_MASK:
+#if !XASH_WIN32
 #ifdef SDL_HINT_OPENGL_ES_DRIVER
 		if( val == REF_GL_CONTEXT_PROFILE_ES )
 		{
@@ -901,6 +902,7 @@ int GL_SetAttribute( int attr, int val )
 			SDL_SetHint( "SDL_VIDEO_X11_FORCE_EGL", "1" );
 		}
 #endif // SDL_HINT_OPENGL_ES_DRIVER
+#endif
 		return SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, val );
 #if SDL_VERSION_ATLEAST( 2, 0, 4 )
 		MAP_REF_API_ATTRIBUTE_TO_SDL( GL_CONTEXT_RELEASE_BEHAVIOR );
@@ -981,11 +983,14 @@ qboolean R_Init_Video( const int type )
 	SDL_SetHint( SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION, "landscape" );
 #endif
 
-#if !XASH_WIN32
+	if( Sys_CheckParm( "-egl" ) )
+#if XASH_WIN32
+		SDL_SetHint( "SDL_OPENGL_ES_DRIVER", "1" );
+#else
+		SDL_SetHint( "SDL_VIDEO_X11_FORCE_EGL", "1" );
+
 	SDL_SetHint( "SDL_VIDEO_X11_XRANDR", "1" );
 	SDL_SetHint( "SDL_VIDEO_X11_XVIDMODE", "1" );
-	if( Sys_CheckParm( "-egl" ) )
-		SDL_SetHint( "SDL_VIDEO_X11_FORCE_EGL", "1" );
 #endif // !XASH_WIN32
 
 	// must be initialized before creating window

filesystem/android.c

@@ -116,6 +116,7 @@ static android_assets_t *FS_LoadAndroidAssets( qboolean engine )
 	Android_GetAssetManager( assets );
 	if( !assets->asset_manager )
 	{
+		Con_Printf( S_ERROR "%s: Can't get asset manager\n", __func__ );
 		FS_CloseAndroidAssets( assets );
 		return NULL;
 	}
@@ -123,6 +124,7 @@ static android_assets_t *FS_LoadAndroidAssets( qboolean engine )
 	assets->dir = AAssetManager_openDir( assets->asset_manager, "" );
 	if( !assets->dir )
 	{
+		Con_Printf( S_ERROR "%s: Can't open root asset directory\n", __func__ );
 		FS_CloseAndroidAssets( assets );
 		return NULL;
 	}
@@ -138,7 +140,7 @@ static int FS_FileTime_AndroidAssets( searchpath_t *search, const char *filename
 	{
 		struct tm file_tm;
 
-		strptime( __DATE__ " "__TIME__, "%b %d %Y %H:%M:%S", &file_tm );
+		strptime( g_buildcommit_date, "%Y-%m-%d %H:%M:%S", &file_tm );
 		time = mktime( &file_tm );
 	}
 

filesystem/wscript

@@ -19,9 +19,10 @@ def configure(conf):
 	if conf.env.DEST_OS == 'android':
 		conf.check_cc(lib='android')
 
-	# remove lib prefix
+	# remove lib prefix, except on Android which has issues unpacking libraries without prefix when debuggable=false
-	if conf.env.cxxshlib_PATTERN.startswith('lib'):
+	if conf.env.DEST_OS != 'android':
-		conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
+		if conf.env.cxxshlib_PATTERN.startswith('lib'):
+			conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
 
 	if conf.check_cc(fragment=MEMFD_CREATE_TEST, msg='Checking for memfd_create', mandatory=False):
 		conf.define('HAVE_MEMFD_CREATE', 1)

public/build.c

@@ -17,34 +17,8 @@ GNU General Public License for more details.
 #include "crtlib.h"
 #include "buildenums.h"
 
-static const char *const mon[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 static const char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
-int Q_buildnum_date( const char *date )
-{
-	int b;
-	int m = 0;
-	int d = 0;
-	int y = 0;
-
-	for( m = 0; m < 11; m++ )
-	{
-		if( !Q_strnicmp( &date[0], mon[m], 3 ))
-			break;
-		d += mond[m];
-	}
-
-	d += Q_atoi( &date[4] ) - 1;
-	y = Q_atoi( &date[7] ) - 1900;
-	b = d + (int)((y - 1) * 365.25f );
-
-	if((( y % 4 ) == 0 ) && m > 1 )
-		b += 1;
-	b -= 41728; // Apr 1 2015
-
-	return b;
-}
-
 int Q_buildnum_iso( const char *date )
 {
 	int y, m, d, b, i;
@@ -82,11 +56,7 @@ int Q_buildnum( void )
 
 	if( b ) return b;
 
-	if( COM_CheckString( g_buildcommit_date ))
+	b = Q_buildnum_iso( g_buildcommit_date );
-		b = Q_buildnum_iso( g_buildcommit_date );
-
-	if( b <= 0 )
-		b = Q_buildnum_date( g_build_date );
 
 	return b;
 }

public/build_vcs.c

@@ -16,4 +16,3 @@ GNU General Public License for more details.
 const char *g_buildcommit = XASH_BUILD_COMMIT;
 const char *g_buildbranch = XASH_BUILD_BRANCH;
 const char *g_buildcommit_date = XASH_BUILD_COMMIT_DATE;
-const char *g_build_date = __DATE__;

public/crtlib.h

@@ -56,7 +56,6 @@ enum
 // build.c
 //
 int Q_buildnum( void );
-int Q_buildnum_date( const char *date );
 int Q_buildnum_iso( const char *date );
 int Q_buildnum_compat( void );
 const char *Q_PlatformStringByID( const int platform );

public/tests/test_build.c

@@ -177,16 +177,10 @@ int main( void )
 	if( Q_buildnum_compat() != 4529 )
 		return 200;
 
-	if( Q_buildnum_date( "Apr 02 2015" ) != 1 )
+	if( Q_buildnum_iso( "2015-04-02 21:19:10 +0300" ) != 1 )
-		return 201;
-
-	if( Q_buildnum_date( "Apr 02 2015" ) != Q_buildnum_iso( "2015-04-02 21:19:10 +0300" ))
 		return 202;
 
-	if( Q_buildnum_date( "Apr 17 2023" ) != 2938 )
+	if( Q_buildnum_iso( "2023-04-17 21:19:10 +0300" ) != 2938 )
-		return 203;
-
-	if( Q_buildnum_date( "Apr 17 2023" ) != Q_buildnum_iso( "2023-04-17 21:19:10 +0300" ))
 		return 204;
 
 	return EXIT_SUCCESS;

public/xash3d_mathlib.c

@@ -144,7 +144,7 @@ void RoundUpHullSize( vec3_t size )
 rsqrt
 =================
 */
-float rsqrt( float number )
+float Q_rsqrt( float number )
 {
 	int	i;
 	float	x, y;

public/xash3d_mathlib.h

@@ -119,7 +119,7 @@ CONSTANTS AND HELPER MACROS
 #define VectorLerp( v1, lerp, v2, c ) ((c)[0] = (v1)[0] + (lerp) * ((v2)[0] - (v1)[0]), (c)[1] = (v1)[1] + (lerp) * ((v2)[1] - (v1)[1]), (c)[2] = (v1)[2] + (lerp) * ((v2)[2] - (v1)[2]))
 #define VectorNormalize( v ) { float ilength = (float)sqrt(DotProduct(v, v));if (ilength) ilength = 1.0f / ilength;v[0] *= ilength;v[1] *= ilength;v[2] *= ilength; }
 #define VectorNormalize2( v, dest ) {float ilength = (float)sqrt(DotProduct(v,v));if (ilength) ilength = 1.0f / ilength;dest[0] = v[0] * ilength;dest[1] = v[1] * ilength;dest[2] = v[2] * ilength; }
-#define VectorNormalizeFast( v ) {float	ilength = (float)rsqrt(DotProduct(v,v)); v[0] *= ilength; v[1] *= ilength; v[2] *= ilength; }
+#define VectorNormalizeFast( v ) {float ilength = (float)Q_rsqrt(DotProduct(v,v)); v[0] *= ilength; v[1] *= ilength; v[2] *= ilength; }
 #define VectorNormalizeLength( v ) VectorNormalizeLength2((v), (v))
 #define VectorNegate(x, y) ((y)[0] = -(x)[0], (y)[1] = -(x)[1], (y)[2] = -(x)[2])
 #define VectorM(scale1, b1, c) ((c)[0] = (scale1) * (b1)[0],(c)[1] = (scale1) * (b1)[1],(c)[2] = (scale1) * (b1)[2])
@@ -158,7 +158,7 @@ typedef struct mplane_s mplane_t;
 typedef struct mstudiobone_s mstudiobone_t;
 typedef struct mstudioanim_s mstudioanim_t;
 
-float rsqrt( float number );
+float Q_rsqrt( float number );
 uint16_t FloatToHalf( float v );
 float HalfToFloat( uint16_t h );
 void RoundUpHullSize( vec3_t size );

scripts/gha/deps_android.sh

@@ -13,7 +13,7 @@ export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.15+6
 export PATH=$PATH:$JAVA_HOME/bin
 
 echo "Download hlsdk-portable"
-git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b android_library_naming 3rdparty/hlsdk-portable || exit 1
+git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b mobile_hacks 3rdparty/hlsdk-portable || exit 1
 
 echo "Download SDL"
 pushd 3rdparty

wscript

@@ -208,10 +208,15 @@ def configure(conf):
 		conf.env.MSVC_TARGETS = ['x86']
 
 	# Load compilers early
-	conf.load('xshlib xcompile compiler_c compiler_cxx gccdeps')
+	conf.load('xshlib xcompile compiler_c compiler_cxx')
 
-	if conf.options.MSVCDEPS:
+	if not conf.options.WAFCACHE:
-		conf.load('msvcdeps')
+		conf.load('gccdeps')
+
+		if conf.options.MSVCDEPS:
+			conf.load('msvcdeps')
+
+	conf.env.WAFCACHE = conf.options.WAFCACHE
 
 	if conf.options.NSWITCH:
 		conf.load('nswitch')
@@ -535,7 +540,7 @@ int main(void) { return (int)BZ2_bzlibVersion(); }'''
 		conf.add_subproject(i.name)
 
 def build(bld):
-	if bld.options.WAFCACHE:
+	if bld.env.WAFCACHE:
 		bld.load('wafcache')
 
 	# guard rails to not let install to root