engine: client: lower the bandwidth test fragment sizes to 1400 and less, as using 64k, 32k and more is unreliable

It's not really a good idea to hammer upstream git servers with cloning same
data over and over. Besides, it's down right now.

.gitmodules

@@ -27,13 +27,13 @@
 	url = https://github.com/FWGS/MultiEmulator
 [submodule "3rdparty/libogg/libogg"]
 	path = 3rdparty/libogg/libogg
-	url = https://gitlab.xiph.org/xiph/ogg.git
+	url = https://github.com/xiph/ogg.git
 [submodule "3rdparty/vorbis/vorbis-src"]
 	path = 3rdparty/vorbis/vorbis-src
-	url = https://gitlab.xiph.org/xiph/vorbis.git
+	url = https://github.com/xiph/vorbis.git
 [submodule "3rdparty/opusfile/opusfile"]
 	path = 3rdparty/opusfile/opusfile
-	url = https://gitlab.xiph.org/xiph/opusfile.git
+	url = https://github.com/xiph/opusfile.git
 [submodule "3rdparty/libbacktrace/libbacktrace"]
 	path = 3rdparty/libbacktrace/libbacktrace
 	url = https://github.com/ianlancetaylor/libbacktrace

Documentation/supported-mod-list.md

@@ -874,7 +874,7 @@ To run this mods on specific platforms you may be need to compile libraries from
 6. [They Hunger: Route666 Demo](https://yadi.sk/d/XKWCseAPohkG6) by *MadMapper*
 
 ## List of supported mods from mobile_hacks branch of HLSDK Portable by FWGS
-Currently, fresh Xash3D FWGS builds uses libraries from this branch, so you can play mods below out-of-the-box.
+Currently, fresh Xash3D FWGS builds for Android, PS Vita and Nintendo Switch uses libraries from this branch, so you can play mods below out-of-the-box.
 
 1. **[Afraid of Monsters](https://www.moddb.com/mods/afraid-of-monsters/downloads/afraid-of-monsters-v1)**
 2. **[Big Lolly](https://www.moddb.com/mods/big-lolly)**

android/app/CMakeLists.txt

@@ -1,17 +1,17 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.22)
 
 # Only used to build Android project
 
 project(XASH_ANDROID)
 
 # armeabi-v7a requires cpufeatures library
-include(AndroidNdkModules)
+if(ANDROID)
-android_ndk_import_module_cpufeatures()
+	include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
+	add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
+	target_link_libraries(cpufeatures dl)
+endif()
 
-find_package(PythonInterp 2.7 REQUIRED)
+include(FindPython)
-
-get_filename_component(C_COMPILER_ID ${CMAKE_C_COMPILER} NAME_WE)
-get_filename_component(CXX_COMPILER_ID ${CMAKE_CXX_COMPILER} NAME_WE)
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 	set(BUILD_TYPE "debug")
@@ -20,30 +20,20 @@ else()
 	list(APPEND WAF_EXTRA_ARGS --enable-poly-opt --enable-lto)
 endif()
 
-if(CMAKE_SIZEOF_VOID_P MATCHES "8")
+if(ANDROID_ABI STREQUAL "x86")
-	set(64BIT ON CACHE BOOL "" FORCE)
+	# HACKHACK: I don't know why but engine gets built as 64-bit binary here
-	list(APPEND WAF_EXTRA_ARGS -8) # only required for x86 when testing this cmakelist under linux
+	list(APPEND WAF_EXTRA_ARGS -4)
 endif()
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
-set(WAF_CC "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET}")
-set(WAF_CXX "${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET}")
 
 # not cleanest way to get upper directory
 set(ENGINE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
 
-execute_process(
+set(WAF_CC "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET}")
-	COMMAND ${CMAKE_COMMAND} -E env
+set(WAF_CXX "${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET}")
-	CC=${WAF_CC} CXX=${WAF_CXX}
+set(WAF ${Python_EXECUTABLE} ${ENGINE_SOURCE_DIR}waf -t ${ENGINE_SOURCE_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/xash3d-fwgs)
-	AR=${CMAKE_AR} STRIP=${CMAKE_STRIP}
-	${PYTHON_EXECUTABLE} waf configure -T ${BUILD_TYPE} -o "${CMAKE_CURRENT_BINARY_DIR}/xash3d-fwgs" ${WAF_EXTRA_ARGS} cmake
-	--check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID}
-	-s "${ENGINE_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check --enable-bundled-deps
-	WORKING_DIRECTORY "${ENGINE_SOURCE_DIR}"
-)
-
-add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/hlsdk-portable" hlsdk-portable)
 
 # try to build minimal SDL. Enable features as we're gonna use them
 set(SDL_RENDER OFF)
@@ -56,5 +46,50 @@ set(SDL_VULKAN OFF)
 set(SDL_OFFSCREEN OFF)
 set(SDL_STATIC OFF)
 add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/SDL" SDL)
-add_subdirectory("${ENGINE_SOURCE_DIR}/" xash3d-fwgs)
+
-add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/mainui" mainui)
+include(ExternalProject)
+
+# gradle passes backslashes to cmake, how does this even work for everybody else?
+string(REPLACE "\\" "/" CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+
+ExternalProject_Add(
+	Xash3DFWGS
+	SOURCE_DIR ${ENGINE_SOURCE_DIR}
+	INSTALL_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+	BUILD_IN_SOURCE TRUE
+	DEPENDS SDL2
+	BUILD_ALWAYS TRUE
+	LOG_CONFIGURE TRUE
+	LOG_BUILD TRUE
+	LOG_INSTALL TRUE
+	LOG_OUTPUT_ON_FAILURE TRUE
+	LOG_MERGED_STDOUTERR TRUE
+
+#	USES_TERMINAL_CONFIGURE TRUE
+#	USES_TERMINAL_BUILD TRUE
+#	USES_TERMINAL_INSTALL TRUE
+
+	# NOTE: setting up WAFLOCK is important to avoid possible race conditions
+	CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env
+		ANDROID_NDK=${ANDROID_NDK}
+		BUILD_CMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+		WAFLOCK=.lock-waf_android_${ANDROID_ABI}_build
+		${WAF} configure -T ${BUILD_TYPE} --android=${ANDROID_ABI},,${CMAKE_SYSTEM_VERSION}
+		-s "${ENGINE_SOURCE_DIR}/3rdparty/SDL" --enable-bundled-deps
+
+	BUILD_COMMAND ${CMAKE_COMMAND} -E env
+		WAFLOCK=.lock-waf_android_${ANDROID_ABI}_build
+		${WAF} build -v
+
+	INSTALL_COMMAND ${CMAKE_COMMAND} -E env
+		WAFLOCK=.lock-waf_android_${ANDROID_ABI}_build
+		${WAF} install --destdir=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+)
+
+add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/hlsdk-portable" hlsdk-portable)
+
+# a1ba: without this, xash3d target will be ignored as nothing depends on it
+add_dependencies(client Xash3DFWGS)
+add_dependencies(server Xash3DFWGS)
+
+

android/app/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 
 android {
     namespace = "su.xash.engine"
-    ndkVersion = "27.2.12479018"
+    ndkVersion = "28.0.13004108"
 
     defaultConfig {
         applicationId = "su.xash"

android/gradle.properties

@@ -20,4 +20,7 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+# Enable verbose output for CMake
+android.native.buildOutput=verbose

common/port.h

@@ -86,8 +86,4 @@ GNU General Public License for more details.
 #include <string.h>
 #include <limits.h>
 
-#if defined XASH_SDL && !defined REF_DLL
-#include <SDL.h>
-#endif
-
 #endif // PORT_H

engine/client/cl_game.c

@@ -13,6 +13,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
+#if XASH_SDL
+#include <SDL.h> // SDL_GetWindowPosition
+#endif // XASH_SDL
+
 #include "common.h"
 #include "client.h"
 #include "const.h"

engine/client/cl_main.c

@@ -68,7 +68,7 @@ CVAR_DEFINE_AUTO( hud_scale_minimal_width, "640", FCVAR_ARCHIVE|FCVAR_LATCH, "if
 CVAR_DEFINE_AUTO( cl_solid_players, "1", 0, "Make all players not solid (can't traceline them)" );
 CVAR_DEFINE_AUTO( cl_updaterate, "20", FCVAR_USERINFO|FCVAR_ARCHIVE, "refresh rate of server messages" );
 CVAR_DEFINE_AUTO( cl_showevents, "0", FCVAR_ARCHIVE, "show events playback" );
-CVAR_DEFINE_AUTO( cl_cmdrate, "60", FCVAR_ARCHIVE, "Max number of command packets sent to server per second" );
+CVAR_DEFINE_AUTO( cl_cmdrate, "30", FCVAR_ARCHIVE, "Max number of command packets sent to server per second" );
 CVAR_DEFINE( cl_interp, "ex_interp", "0.1", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "Interpolate object positions starting this many seconds in past" );
 CVAR_DEFINE_AUTO( cl_nointerp, "0", 0, "disable interpolation of entities and players" );
 static CVAR_DEFINE_AUTO( cl_dlmax, "0", FCVAR_USERINFO|FCVAR_ARCHIVE, "max allowed outcoming fragment size" );
@@ -94,7 +94,7 @@ static CVAR_DEFINE_AUTO( name, username, FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_PRIN
 static CVAR_DEFINE_AUTO( model, "", FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_FILTERABLE, "player model ('player' is a singleplayer model)" );
 static CVAR_DEFINE_AUTO( topcolor, "0", FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_FILTERABLE, "player top color" );
 static CVAR_DEFINE_AUTO( bottomcolor, "0", FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_FILTERABLE, "player bottom color" );
-CVAR_DEFINE_AUTO( rate, "3500", FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_FILTERABLE, "player network rate" );
+CVAR_DEFINE_AUTO( rate, "25000", FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_FILTERABLE, "player network rate" );
 
 static CVAR_DEFINE_AUTO( cl_ticket_generator, "revemu2013", FCVAR_ARCHIVE, "you wouldn't steal a car" );
 
@@ -1183,7 +1183,11 @@ Returns bandwidth test fragment size
 */
 static int CL_GetTestFragmentSize( void )
 {
-	const int fragmentSizes[CL_TEST_RETRIES] = { 64000, 32000, 10666, 5200, 1400 };
+	// const int fragmentSizes[CL_TEST_RETRIES] = { 64000, 32000, 10666, 5200, 1400 };
+
+	// it turns out, even if we pass the bandwidth test, it doesn't mean we can use such large fragments
+	// as a temporary solution, use smaller fragment sizes
+	const int fragmentSizes[CL_TEST_RETRIES] = { 1400, 1200, 1000, 800, 508 };
 	if( cls.connect_retry >= 0 && cls.connect_retry < CL_TEST_RETRIES )
 		return bound( FRAGMENT_MIN_SIZE, fragmentSizes[cls.connect_retry], FRAGMENT_MAX_SIZE );
 	else

engine/client/console.c

@@ -2031,7 +2031,7 @@ void Con_DrawVersion( void )
 	int	start, height = refState.height;
 	string	curbuild;
 
-	if( !scr_drawversion.value || CL_IsDevOverviewMode() == 2 || net_graph.value )
+	if( !scr_drawversion.value )
 		return;
 
 	if( cls.key_dest == key_menu )
@@ -2043,6 +2043,9 @@ void Con_DrawVersion( void )
 	{
 		qboolean draw_version;
 
+		if( CL_IsDevOverviewMode() == 2 || net_graph.value )
+			return;
+
 		draw_version = cls.scrshot_action == scrshot_normal
 			|| cls.scrshot_action == scrshot_snapshot
 			|| host.force_draw_version_time > host.realtime;

engine/client/in_touch.c

@@ -938,7 +938,7 @@ static void Touch_AddButton_f( void )
 	// to let imagelib choose better format
 	//
 	// Remove this when old engine migration would be done
-	if( Q_stricmp( COM_FileExtension( texture ), "tga" ))
+	if( !Q_stricmp( COM_FileExtension( texture ), "tga" ))
 		COM_StripExtension( texture );
 
 	if( Cmd_Argc( ) >= 8 )
@@ -1180,14 +1180,6 @@ void Touch_Init( void )
 	Cvar_RegisterVariable( &touch_enable );
 	Cvar_RegisterVariable( &touch_emulate );
 
-	// TODO: touch platform
-#if SDL_VERSION_ATLEAST( 2, 0, 10 )
-	SDL_SetHint( SDL_HINT_MOUSE_TOUCH_EVENTS, "0" );
-	SDL_SetHint( SDL_HINT_TOUCH_MOUSE_EVENTS, "0" );
-#elif defined( SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH )
-	SDL_SetHint( SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "1" );
-#endif
-
 	touch.initialized = true;
 }
 

engine/client/input.c

@@ -205,9 +205,10 @@ void IN_ToggleClientMouse( int newstate, int oldstate )
 	}
 }
 
-static void IN_SetRelativeMouseMode( qboolean set, qboolean verbose )
+void IN_SetRelativeMouseMode( qboolean set )
 {
 	static qboolean s_bRawInput;
+	qboolean verbose = m_grab_debug.value ? true : false;
 
 	if( set && !s_bRawInput )
 	{
@@ -231,9 +232,10 @@ static void IN_SetRelativeMouseMode( qboolean set, qboolean verbose )
 	}
 }
 
-static void IN_SetMouseGrab( qboolean set, qboolean verbose )
+void IN_SetMouseGrab( qboolean set )
 {
 	static qboolean s_bMouseGrab;
+	qboolean verbose = m_grab_debug.value ? true : false;
 
 	if( set && !s_bMouseGrab )
 	{
@@ -258,7 +260,7 @@ static void IN_SetMouseGrab( qboolean set, qboolean verbose )
 
 static void IN_CheckMouseState( qboolean active )
 {
-	qboolean use_raw_input, verbose;
+	qboolean use_raw_input;
 
 #if XASH_WIN32
 	use_raw_input = ( m_rawinput.value && clgame.client_dll_uses_sdl ) || clgame.dllFuncs.pfnLookEvent != NULL;
@@ -266,20 +268,18 @@ static void IN_CheckMouseState( qboolean active )
 	use_raw_input = true; // always use SDL code
 #endif
 
-	verbose = m_grab_debug.value ? true : false;
-
 	if( m_ignore.value )
 		active = false;
 
 	if( active && use_raw_input && !host.mouse_visible && cls.state == ca_active )
-		IN_SetRelativeMouseMode( true, verbose );
+		IN_SetRelativeMouseMode( true );
 	else
-		IN_SetRelativeMouseMode( false, verbose );
+		IN_SetRelativeMouseMode( false );
 
 	if( active && !host.mouse_visible && cls.state == ca_active )
-		IN_SetMouseGrab( true, verbose );
+		IN_SetMouseGrab( true );
 	else
-		IN_SetMouseGrab( false, verbose );
+		IN_SetMouseGrab( false );
 }
 
 /*

engine/client/input.h

@@ -46,6 +46,9 @@ uint IN_CollectInputDevices( void );
 void IN_LockInputDevices( qboolean lock );
 void IN_EngineAppendMove( float frametime, usercmd_t *cmd, qboolean active );
 
+void IN_SetRelativeMouseMode( qboolean set );
+void IN_SetMouseGrab( qboolean set );
+
 extern convar_t m_yaw;
 extern convar_t m_pitch;
 //

engine/common/filesystem_engine.c

@@ -16,6 +16,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
+#if XASH_SDL
+#include <SDL.h> // SDL_GetBasePath
+#endif
+
 #include <errno.h>
 #include "common.h"
 #include "library.h"

engine/common/net_ws.c

@@ -2027,6 +2027,7 @@ void NET_Init( void )
 	Cvar_RegisterVariable( &net_fakelag );
 	Cvar_RegisterVariable( &net_fakeloss );
 	Cvar_RegisterVariable( &net_resolve_debug );
+	Cvar_RegisterVariable( &net_clockwindow );
 
 	Q_snprintf( cmd, sizeof( cmd ), "%i", PORT_SERVER );
 	Cvar_FullSet( "hostport", cmd, FCVAR_READ_ONLY );

engine/platform/dos/vid_dos.c

@@ -142,17 +142,10 @@ static qboolean vsync;
 
 void GL_UpdateSwapInterval( void )
 {
-	// disable VSync while level is loading
+	if( FBitSet( gl_vsync.flags, FCVAR_CHANGED ))
-	if( cls.state < ca_active )
 	{
-		// setup vsync here
+		ClearBits( gl_vsync.flags, FCVAR_CHANGED );
-		vsync = false;
+		vsync = gl_vsync.value;
-		SetBits( gl_vsync->flags, FCVAR_CHANGED );
-	}
-	else if( FBitSet( gl_vsync->flags, FCVAR_CHANGED ))
-	{
-		ClearBits( gl_vsync->flags, FCVAR_CHANGED );
-		vsync = true;
 	}
 }
 

engine/platform/linux/vid_fbdev.c

@@ -161,17 +161,10 @@ void* GL_GetProcAddress( const char *name ) // RenderAPI requirement
 
 void GL_UpdateSwapInterval( void )
 {
-	// disable VSync while level is loading
+	if( FBitSet( gl_vsync.flags, FCVAR_CHANGED ))
-	if( cls.state < ca_active )
-	{
-		// setup fb vsync here
-		fb.vsync = false;
-		SetBits( gl_vsync.flags, FCVAR_CHANGED );
-	}
-	else if( FBitSet( gl_vsync.flags, FCVAR_CHANGED ))
 	{
 		ClearBits( gl_vsync.flags, FCVAR_CHANGED );
-		fb.vsync = true;
+		fb.vsync = gl_vsync.value;
 	}
 }
 

engine/platform/platform.h

@@ -31,6 +31,7 @@ GNU General Public License for more details.
 ==============================================================================
 */
 double Platform_DoubleTime( void );
+void Platform_Sleep( int msec );
 void Platform_ShellExecute( const char *path, const char *parms );
 void Platform_MessageBox( const char *title, const char *message, qboolean parentMainWindow );
 void Platform_SetStatus( const char *status );
@@ -168,19 +169,6 @@ static inline void Platform_SetupSigtermHandling( void )
 #endif
 }
 
-static inline void Platform_Sleep( int msec )
-{
-#if XASH_TIMER == TIMER_SDL
-	SDL_Delay( msec );
-#elif XASH_TIMER == TIMER_POSIX
-	usleep( msec * 1000 );
-#elif XASH_TIMER == TIMER_WIN32
-	Sleep( msec );
-#else
-	// stub
-#endif
-}
-
 static inline qboolean Platform_NanoSleep( int nsec )
 {
 	// SDL2 doesn't have nanosleep, so use low-level functions here

engine/platform/posix/crash_glibc.c

@@ -17,9 +17,10 @@ GNU General Public License for more details.
 // have backtrace() and backtrace_symbols() calls, which replace for us
 // platform-specific code
 #if HAVE_EXECINFO
-#include "common.h"
 #include <execinfo.h>
 #include <signal.h>
+#include "common.h"
+#include "input.h"
 
 void Sys_Crash( int signal, siginfo_t *si, void *context )
 {
@@ -70,8 +71,8 @@ void Sys_Crash( int signal, siginfo_t *si, void *context )
 
 	// put MessageBox as Sys_Error
 	Msg( "%s\n", message );
-#ifdef XASH_SDL
+#if !XASH_DEDICATED
-	SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
+	IN_SetMouseGrab( false );
 #endif
 	host.crashed = true;
 	Platform_MessageBox( "Xash Error", message, false );

engine/platform/posix/crash_libbacktrace.c

@@ -17,7 +17,7 @@ GNU General Public License for more details.
 #include <signal.h>
 #include "common.h"
 #include "backtrace.h"
-
+#include "input.h"
 
 static struct backtrace_state *g_bt_state;
 static qboolean enable_libbacktrace;
@@ -111,8 +111,10 @@ static int Sys_BacktracePrintFull( void *data, uintptr_t pc, const char *filenam
 		module_name = dlinfo.dli_fname;
 	else module_name = NULL;
 
-	if( filename && lineno && function )
+	if( filename && lineno >= 0 && function )
 	{
+		filename = COM_FileWithoutPath( filename );
+
 		if( module_name )
 			Sys_AppendPrint( pd, "%2d: %s (%s:%d) (%s)\n", pd->idx++, function, filename, lineno, module_name );
 		else
@@ -162,8 +164,8 @@ void Sys_CrashLibbacktrace( int signal, siginfo_t *si, void *context )
 
 	// put MessageBox as Sys_Error
 	Msg( "%s\n", message );
-#ifdef XASH_SDL
+#if !XASH_DEDICATED
-	SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
+	IN_SetMouseGrab( false );
 #endif
 	host.crashed = true;
 	Platform_MessageBox( "Xash Error", message, false );

engine/platform/posix/crash_posix.c

@@ -26,6 +26,7 @@ GNU General Public License for more details.
 #include <signal.h>
 #include <sys/mman.h>
 #include "library.h"
+#include "input.h"
 
 void Sys_Crash( int signal, siginfo_t *si, void *context );
 void Sys_CrashLibbacktrace( int signal, siginfo_t *si, void *context );
@@ -192,8 +193,8 @@ void Sys_Crash( int signal, siginfo_t *si, void *context )
 
 	// put MessageBox as Sys_Error
 	Msg( "%s\n", message );
-#ifdef XASH_SDL
+#if !XASH_DEDICATED
-	SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
+	IN_SetMouseGrab( false );
 #endif
 	host.crashed = true;
 	Platform_MessageBox( "Xash Error", message, false );

engine/platform/posix/sys_posix.c

@@ -174,5 +174,10 @@ double Platform_DoubleTime( void )
 #endif
 	return (double) ts.tv_sec + (double) ts.tv_nsec/1000000000.0;
 }
+
+void Platform_Sleep( int msec )
+{
+	usleep( msec * 1000 );
+}
 #endif // XASH_TIMER == TIMER_POSIX
 

engine/platform/sdl/sys_sdl.c

@@ -32,6 +32,11 @@ double Platform_DoubleTime( void )
 	CurrentTime = SDL_GetPerformanceCounter();
 	return (double)( CurrentTime - g_ClockStart ) / (double)( g_PerformanceFrequency );
 }
+
+void Platform_Sleep( int msec )
+{
+	SDL_Delay( msec );
+}
 #endif // XASH_TIMER == TIMER_SDL
 
 #if XASH_MESSAGEBOX == MSGBOX_SDL
@@ -109,8 +114,11 @@ void SDLash_Init( const char *basedir )
 		host.type = HOST_DEDICATED;
 	}
 
-#if XASH_SDL == 2
+#if SDL_MAJOR_VERSION >= 2
-	SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+	SDL_SetHint( SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0" );
+	SDL_SetHint( SDL_HINT_MOUSE_TOUCH_EVENTS, "0" );
+	SDL_SetHint( SDL_HINT_TOUCH_MOUSE_EVENTS, "0" );
+
 	SDL_StopTextInput();
 #endif // XASH_SDL == 2
 

engine/platform/sdl/vid_sdl.c

@@ -488,13 +488,7 @@ GL_UpdateSwapInterval
 void GL_UpdateSwapInterval( void )
 {
 #if SDL_VERSION_ATLEAST( 2, 0, 0 )
-	// disable VSync while level is loading
+	if( FBitSet( gl_vsync.flags, FCVAR_CHANGED ))
-	if( cls.state < ca_active )
-	{
-		SDL_GL_SetSwapInterval( 0 );
-		SetBits( gl_vsync.flags, FCVAR_CHANGED );
-	}
-	else if( FBitSet( gl_vsync.flags, FCVAR_CHANGED ))
 	{
 		ClearBits( gl_vsync.flags, FCVAR_CHANGED );
 

engine/platform/win32/crash_win.c

@@ -14,11 +14,15 @@ GNU General Public License for more details.
 */
 
 #include "platform/platform.h"
+#include "input.h"
 
 #define DBGHELP 1 // we always enable dbghelp.dll on Windows targets
 
-#if DBGHELP
+#if XASH_SDL
+#include <SDL.h>
+#endif // XASH_SDL
 
+#if DBGHELP
 #include <winnt.h>
 #include <dbghelp.h>
 #include <psapi.h>
@@ -268,8 +272,8 @@ static long _stdcall Sys_Crash( PEXCEPTION_POINTERS pInfo )
 		// check to avoid recursive call
 		host.crashed = true;
 
-#ifdef XASH_SDL
+#if !XASH_DEDICATED
-		SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
+		IN_SetMouseGrab( false );
 #endif // XASH_SDL
 
 #if DBGHELP

engine/platform/win32/sys_win.c

@@ -36,6 +36,11 @@ double Platform_DoubleTime( void )
 
 	return (double)( CurrentTime.QuadPart - g_ClockStart.QuadPart ) / (double)( g_PerformanceFrequency.QuadPart );
 }
+
+void Platform_Sleep( int msec )
+{
+	Sleep( msec );
+}
 #endif // XASH_TIMER == TIMER_WIN32
 
 void Win32_Init( qboolean con_showalways )

engine/server/server.h

@@ -205,69 +205,62 @@ typedef struct
 
 typedef struct sv_client_s
 {
-	cl_state_t	state;
+	cl_state_t  state;
-	cl_upload_t	upstate;			// uploading state
+	cl_upload_t upstate;    // uploading state
-	char		name[32];			// extracted from userinfo, color string allowed
+	char        name[32];   // extracted from userinfo, color string allowed
-	uint		flags;			// client flags, some info
+	uint        flags;      // client flags, some info
-	CRC32_t		crcValue;
+	uint        extensions; // protocol extensions
 
-	char		userinfo[MAX_INFO_STRING];	// name, etc (received from client)
+	char hashedcdkey[34];            // MD5 hash is 32 hex #'s, plus trailing 0
-	char		physinfo[MAX_INFO_STRING];	// set on server (transmit to client)
+	char userinfo[MAX_INFO_STRING];  // name, etc (received from client)
+	char physinfo[MAX_INFO_STRING];  // set on server (transmit to client)
+	char useragent[MAX_INFO_STRING];
 
-	netchan_t		netchan;
+	byte ignorecmdtime_warned; // did we warn our server operator in the log for this batch of commands?
-	int		chokecount;			// number of messages rate supressed
+	byte m_bLoopback;                // does this client want to hear his own voice?
-	int		delta_sequence;		// -1 = no compression.
+	uint listeners;   // which other clients does this guy's voice stream go to?
-
-	double		next_messagetime;		// time when we should send next world state update
-	double		next_checkpingtime;		// time to send all players pings to client
-	double		next_sendinfotime;		// time to send info about all players
-	double		cl_updaterate;		// client requested updaterate
-	double		timebase;			// client timebase
-	double		connection_started;
-
-	char		hashedcdkey[34];		// MD5 hash is 32 hex #'s, plus trailing 0
-
-	customization_t	customdata;		// player customization linked list
-	resource_t	resourcesonhand;
-	resource_t	resourcesneeded;		// <mapname.res> from client (server downloading)
-	usercmd_t		lastcmd;			// for filling in big drops
-
-	double		connecttime;
-	double		cmdtime;
-	double		ignorecmdtime;
-
-	int		packet_loss;
-	float		latency;
-
-	int		ignored_ents;		// if visibility list is full we should know how many entities will be ignored
-	edict_t		*edict;			// EDICT_NUM(clientnum+1)
-	edict_t		*pViewEntity;		// svc_setview member
-	edict_t		*viewentity[MAX_VIEWENTS];	// list of portal cameras in player PVS
-	int		num_viewents;		// num of portal cameras that can merge PVS
-
-	qboolean		m_bLoopback;		// Does this client want to hear his own voice?
-	uint		listeners;		// which other clients does this guy's voice stream go to?
-
-	// the datagram is written to by sound calls, prints, temp ents, etc.
-	// it can be harmlessly overflowed.
-	sizebuf_t		datagram;
-	byte		datagram_buf[MAX_DATAGRAM];
-
-	client_frame_t	*frames;			// updates can be delta'd from here
-	event_state_t	events;			// delta-updated events cycle
-
-	int		challenge;		// challenge of this user, randomly generated
-	int		userid;			// identifying number on server
-	int		extensions;
-	char		useragent[MAX_INFO_STRING];
 
 	int ignorecmdtime_warns; // how many times client time was faster than server during this session
-	qboolean ignorecmdtime_warned; // did we warn our server operator in the log for this batch of commands?
+	int userid;              // identifying number on server
 
+	netchan_t netchan;
+	sizebuf_t datagram; // the datagram is written to by sound calls, prints, temp ents, etc.
+	byte      datagram_buf[MAX_DATAGRAM]; // it can be harmlessly overflowed.
+
+	int chokecount;     // number of messages rate supressed
+	int delta_sequence; // -1 = no compression.
+
+	double next_messagetime;   // time when we should send next world state update
+	double next_checkpingtime; // time to send all players pings to client
+	double next_sendinfotime;  // time to send info about all players
+	double cl_updaterate;      // client requested updaterate
+	double timebase;           // client timebase
+	double connection_started;
+
+	customization_t customdata;      // player customization linked list
+	resource_t      resourcesonhand;
+	resource_t      resourcesneeded; // <mapname.res> from client (server downloading)
+	usercmd_t       lastcmd;         // for filling in big drops
+
+	int    packet_loss;
+	double connecttime;
+	double cmdtime;
+	double ignorecmdtime;
+	float  latency;
+
+	int     ignored_ents; // if visibility list is full we should know how many entities will be ignored
+	edict_t *edict;       // EDICT_NUM(clientnum+1)
+	edict_t *pViewEntity; // svc_setview member
+	edict_t *viewentity[MAX_VIEWENTS]; // list of portal cameras in player PVS
+	int     num_viewents; // num of portal cameras that can merge PVS
+
+	int    userinfo_change_attempts;
 	double fullupdate_next_calltime;
 	double userinfo_next_changetime;
 	double userinfo_penalty;
-	int    userinfo_change_attempts;
+
+	client_frame_t *frames; // updates can be delta'd from here
+	event_state_t  events;  // delta-updated events cycle
 } sv_client_t;
 
 /*

engine/server/sv_client.c

@@ -277,6 +277,25 @@ static sv_client_t *SV_FindEmptySlot( void )
 	return NULL;
 }
 
+static void SV_MaybeNotifyPlayerCountChange( const sv_client_t *cl, const char *address )
+{
+	int i, count = 0;
+
+	// if this was the first client on the server, or the last client
+	// the server can hold, send a heartbeat to the master.
+	for( i = 0; i < svs.maxclients; i++ )
+	{
+		if( svs.clients[i].state >= cs_connected )
+			count++;
+	}
+
+	if( count == 1 || count == svs.maxclients )
+		NET_MasterClear();
+
+	Log_Printf( "\"%s<%i><%i><>\" connected, address \"%s\"\n",
+		cl->name, cl->userid, (int)( cl - svs.clients ), address );
+}
+
 /*
 ==================
 SV_ConnectClient
@@ -288,9 +307,10 @@ static void SV_ConnectClient( netadr_t from )
 {
 	char userinfo[MAX_INFO_STRING];
 	char protinfo[MAX_INFO_STRING];
+	client_frame_t *frames;
 	sv_client_t *newcl = NULL;
 	int qport, version;
-	int i, count = 0;
+	int i;
 	int challenge;
 	const char *s;
 	int extensions;
@@ -335,12 +355,6 @@ static void SV_ConnectClient( netadr_t from )
 	if( !SV_ProcessUserAgent( from, protinfo ))
 		return;
 
-	if( Q_strlen( Info_ValueForKey( protinfo, "uuid" )) != 32 )
-	{
-		SV_RejectConnection( from, "invalid authentication certificate length\n" );
-		return;
-	}
-
 	// extract qport from protocol info
 	qport = Q_atoi( Info_ValueForKey( protinfo, "qport" ));
 	extensions = Q_atoi( Info_ValueForKey( protinfo, "ext" ));
@@ -397,20 +411,20 @@ static void SV_ConnectClient( netadr_t from )
 
 	// build a new connection
 	// accept the new client
-
 	sv.current_client = newcl;
+	frames = Mem_Realloc( host.mempool, newcl->frames, sizeof( client_frame_t ) * SV_UPDATE_BACKUP );
+	memset( frames, 0, sizeof( client_frame_t ) * SV_UPDATE_BACKUP );
+	SV_ClearResourceLists( newcl );
+
+	memset( newcl, 0, sizeof( *newcl ));
+
 	newcl->edict = EDICT_NUM(( newcl - svs.clients ) + 1 );
-	newcl->challenge = challenge; // save challenge for checksumming
+	newcl->frames = frames;
-	newcl->frames = (client_frame_t *)Mem_Realloc( host.mempool, newcl->frames, sizeof( client_frame_t ) * SV_UPDATE_BACKUP );
-	memset( newcl->frames, 0, sizeof( client_frame_t ) * SV_UPDATE_BACKUP );
 	newcl->userid = g_userid++;	// create unique userid
 	newcl->state = cs_connected;
-	newcl->extensions = extensions & (NET_EXT_SPLITSIZE);
+	newcl->extensions = FBitSet( extensions, NET_EXT_SPLITSIZE );
 	Q_strncpy( newcl->useragent, protinfo, sizeof( newcl->useragent ));
 
-	// reset viewentities (from previous level)
-	memset( newcl->viewentity, 0, sizeof( newcl->viewentity ));
-	newcl->num_viewents = 0;
 	// HACKHACK: can hear all players by default to avoid issues
 	// with server.dll without voice game manager
 	newcl->listeners = -1;
@@ -435,47 +449,18 @@ static void SV_ConnectClient( netadr_t from )
 	newcl->connection_started = host.realtime;
 	newcl->cl_updaterate = 0.05;	// 20 fps as default
 	newcl->delta_sequence = -1;
-	newcl->flags = 0;
-
-	// reset any remaining events
-	memset( &newcl->events, 0, sizeof( newcl->events ));
 
 	// parse some info from the info strings (this can override cl_updaterate)
 	Q_strncpy( newcl->userinfo, userinfo, sizeof( newcl->userinfo ));
-	newcl->fullupdate_next_calltime = 0;
-	newcl->userinfo_next_changetime = 0;
-	newcl->userinfo_penalty = 0;
-	newcl->userinfo_change_attempts = 0;
 
 	SV_UserinfoChanged( newcl );
-	SV_ClearResourceLists( newcl );
+
-#if 0
-	memset( &newcl->resourcesneeded, 0, sizeof( resource_t ));
-	memset( &newcl->resourcesonhand, 0, sizeof( resource_t ));
-	newcl->resourcesneeded.pNext = newcl->resourcesneeded.pPrev = &newcl->resourcesneeded;
-	newcl->resourcesonhand.pNext = newcl->resourcesonhand.pPrev = &newcl->resourcesonhand;
-#endif
 	newcl->next_messagetime = host.realtime + newcl->cl_updaterate;
-	newcl->next_sendinfotime = 0.0;
-	newcl->ignored_ents = 0;
-	newcl->chokecount = 0;
 
 	// reset stats
 	newcl->next_checkpingtime = -1.0;
-	newcl->packet_loss = 0;
 
-	// if this was the first client on the server, or the last client
+	SV_MaybeNotifyPlayerCountChange( newcl, NET_AdrToString( newcl->netchan.remote_address ));
-	// the server can hold, send a heartbeat to the master.
-	for( i = 0; i < svs.maxclients; i++ )
-	{
-		if( svs.clients[i].state >= cs_connected )
-			count++;
-	}
-
-	Log_Printf( "\"%s<%i><%i><>\" connected, address \"%s\"\n", newcl->name, newcl->userid, i, NET_AdrToString( newcl->netchan.remote_address ));
-
-	if( count == 1 || count == svs.maxclients )
-		NET_MasterClear();
 }
 
 /*
@@ -487,25 +472,21 @@ A connection request that came from the game module
 */
 edict_t *GAME_EXPORT SV_FakeConnect( const char *netname )
 {
-	char		userinfo[MAX_INFO_STRING];
+	char userinfo[MAX_INFO_STRING];
-	int		i, count = 0;
+	int i, count = 0;
-	sv_client_t	*cl;
+	sv_client_t *cl;
-
-	if( !COM_CheckString( netname ))
-		netname = "Bot";
 
 	// find a client slot
-	for( i = 0, cl = svs.clients; i < svs.maxclients; i++, cl++ )
+	cl = SV_FindEmptySlot();
-	{
-		if( cl->state == cs_free )
-			break;
-	}
 
-	if( i == svs.maxclients )
+	if( !cl )
 		return NULL; // server is full
 
 	userinfo[0] = '\0';
 
+	if( !COM_CheckString( netname ))
+		netname = "Bot";
+
 	// setup fake client params
 	Info_SetValueForKey( userinfo, "name", netname, sizeof( userinfo ));
 	Info_SetValueForKey( userinfo, "model", "gordon", sizeof( userinfo ));
@@ -515,34 +496,26 @@ edict_t *GAME_EXPORT SV_FakeConnect( const char *netname )
 	// build a new connection
 	// accept the new client
 	sv.current_client = cl;
+	if( cl->frames )
+		Mem_Free( cl->frames );	// fakeclients doesn't have frames
+	SV_ClearResourceLists( cl );
 
-	if( cl->frames ) Mem_Free( cl->frames );	// fakeclients doesn't have frames
+	memset( cl, 0, sizeof( *cl ));
-	memset( cl, 0, sizeof( sv_client_t ));
 
-	cl->edict = EDICT_NUM( (cl - svs.clients) + 1 );
+	cl->state = cs_spawned;
-	cl->userid = g_userid++;		// create unique userid
+	cl->edict = EDICT_NUM(( cl - svs.clients ) + 1 );
+	cl->userid = g_userid++; // create unique userid
 	SetBits( cl->flags, FCL_FAKECLIENT );
 
 	// parse some info from the info strings
 	Q_strncpy( cl->userinfo, userinfo, sizeof( cl->userinfo ));
+
 	SV_UserinfoChanged( cl );
 	SetBits( cl->flags, FCL_RESEND_USERINFO );
-	cl->next_sendinfotime = 0.0;
-
-	// if this was the first client on the server, or the last client
-	// the server can hold, send a heartbeat to the master.
-	for( i = 0, cl = svs.clients; i < svs.maxclients; i++, cl++ )
-		if( cl->state >= cs_connected ) count++;
-	cl = sv.current_client;
-
-	Log_Printf( "\"%s<%i><%i><>\" connected, address \"local\"\n", cl->name, cl->userid, i );
-
 	SetBits( cl->edict->v.flags, FL_CLIENT|FL_FAKECLIENT );	// mark it as fakeclient
 	cl->connection_started = host.realtime;
-	cl->state = cs_spawned;
 
-	if( count == 1 || count == svs.maxclients )
+	SV_MaybeNotifyPlayerCountChange( cl, "local" );
-		NET_MasterClear();
 
 	return cl->edict;
 }
@@ -772,7 +745,7 @@ const char *SV_GetClientIDString( sv_client_t *cl )
 	if( sv_lan.value )
 		return "ID_LAN";
 
-	Q_snprintf( result, sizeof( result ), "ID_%s", MD5_Print( (byte *)cl->hashedcdkey ));
+	Q_snprintf( result, sizeof( result ), "ID_%s", cl->hashedcdkey );
 	return result;
 }
 
@@ -3196,10 +3169,8 @@ void SV_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 			if( len > 0 )
 				Netchan_OutOfBand( NS_SERVER, from, len, (byte*)buf );
 		}
-		else
+		else if( sv_log_outofband.value )
-		{
 			Con_DPrintf( S_ERROR "bad connectionless packet from %s:\n%s\n", NET_AdrToString( from ), args );
-		}
 	}
 }
 
@@ -3330,6 +3301,10 @@ static void SV_ParseClientMove( sv_client_t *cl, sizebuf_t *msg )
 		SV_RunCmd( cl, &cmds[i], cl->netchan.incoming_sequence - i );
 	}
 
+	// was player kicked? stop here
+	if( cl->state <= cs_zombie )
+		return;
+
 	cl->lastcmd = cmds[0];
 
 	// adjust latency time by 1/2 last client frame since

engine/server/sv_main.c

@@ -763,6 +763,31 @@ qboolean SV_ProcessUserAgent( netadr_t from, const char *useragent )
 {
 	const char *input_devices_str = Info_ValueForKey( useragent, "d" );
 	const char *id = Info_ValueForKey( useragent, "uuid" );
+	size_t len, i;
+
+	len = Q_strlen( id );
+	if( len != 32 )
+	{
+		SV_RejectConnection( from, "invalid authentication certificate\n" );
+		return false;
+	}
+
+	for( i = 0; i < len; i++ )
+	{
+		char c = id[i];
+
+		if( !isdigit( id[i] ) && !( c >= 'a' && c <= 'f' ))
+		{
+			SV_RejectConnection( from, "invalid authentication certificate\n" );
+			return false;
+		}
+	}
+
+	if( SV_CheckID( id ))
+	{
+		SV_RejectConnection( from, "You are banned!\n" );
+		return false;
+	}
 
 	if( !sv_allow_noinputdevices.value && ( !input_devices_str || !input_devices_str[0] ) )
 	{
@@ -796,17 +821,6 @@ qboolean SV_ProcessUserAgent( netadr_t from, const char *useragent )
 		}
 	}
 
-	if( id )
-	{
-		qboolean banned = SV_CheckID( id );
-
-		if( banned )
-		{
-			SV_RejectConnection( from, "You are banned!\n" );
-			return false;
-		}
-	}
-
 	return true;
 }
 

engine/server/sv_pmove.c

@@ -892,6 +892,10 @@ void SV_RunCmd( sv_client_t *cl, usercmd_t *ucmd, int random_seed )
 	vec3_t	oldvel;
 	usercmd_t cmd;
 
+	// if the player got kicked, do not process commands
+	if( cl->state <= cs_zombie )
+		return;
+
 	clent = cl->edict;
 	cmd = *ucmd;
 

ref/gl/gl_opengl.c

@@ -907,13 +907,7 @@ static void GL_InitExtensionsBigGL( void )
 		GL_CheckExtension( "GL_ARB_seamless_cube_map", NULL, 0, "gl_texture_cubemap_seamless", GL_ARB_SEAMLESS_CUBEMAP, 0 );
 	}
 
-	// NPOT textures support
+	GL_CheckExtension( "GL_ARB_texture_non_power_of_two", NULL, 0, "gl_texture_npot", GL_ARB_TEXTURE_NPOT_EXT, 0 );
-	if( !GL_CheckExtension( "GL_ARB_texture_non_power_of_two", NULL, 0, "gl_texture_npot", GL_ARB_TEXTURE_NPOT_EXT, 0 ))
-	{
-		// vitaGL exposes OES extension
-		GL_CheckExtension( "GL_OES_texture_npot", NULL, 0, "gl_texture_npot", GL_ARB_TEXTURE_NPOT_EXT, 0 );
-	}
-
 	GL_CheckExtension( "GL_ARB_texture_compression", texturecompressionfuncs, ARRAYSIZE( texturecompressionfuncs ), "gl_texture_dxt_compression", GL_TEXTURE_COMPRESSION_EXT, 0 );
 	if( !GL_CheckExtension( "GL_EXT_texture_edge_clamp", NULL, 0, "gl_clamp_to_edge", GL_CLAMPTOEDGE_EXT, 2.0 )) // present in ES2
 		GL_CheckExtension( "GL_SGIS_texture_edge_clamp", NULL, 0, "gl_clamp_to_edge", GL_CLAMPTOEDGE_EXT, 0 );

ref/gl/gl_rsurf.c

@@ -1093,6 +1093,14 @@ static void R_RenderFullbrights( void )
 	pglBlendFunc( GL_ONE, GL_ONE );
 	pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 
+	// if fullbright textures are drawn in separate pass from VBO they
+	// cause z-fighting, this is noticeable on `slide_waifufu.bsp` map
+	if( R_HasEnabledVBO() && gl_polyoffset.value )
+	{
+		pglEnable( GL_POLYGON_OFFSET_FILL );
+		pglPolygonOffset( -1.0f, -gl_polyoffset.value );
+	}
+
 	for( i = draw_fullbrights.first; i <= draw_fullbrights.last; i++ )
 	{
 		es = fullbright_surfaces[i];
@@ -1108,6 +1116,9 @@ static void R_RenderFullbrights( void )
 		es->lumachain = NULL;
 	}
 
+	if( R_HasEnabledVBO() && gl_polyoffset.value )
+		pglDisable( GL_POLYGON_OFFSET_FILL );
+
 	pglDisable( GL_BLEND );
 	pglDepthMask( GL_TRUE );
 	pglDisable( GL_ALPHA_TEST );

scripts/waifulib/compiler_optimizations.py

@@ -61,8 +61,8 @@ CFLAGS = {
 	'common': {
 		# disable thread-safe local static initialization for C++11 code, as it cause crashes on Windows XP
 		'msvc':    ['/D_USING_V110_SDK71_', '/FS', '/Zc:threadSafeInit-', '/MT', '/MP', '/Zc:__cplusplus'],
-		'clang':   ['-g', '-gdwarf-2', '-fvisibility=hidden', '-fno-threadsafe-statics'],
+		'clang':   ['-g', '-gdwarf-2', '-fvisibility=hidden', '-fno-threadsafe-statics', '-fasynchronous-unwind-tables'],
-		'gcc':     ['-g', '-fvisibility=hidden'],
+		'gcc':     ['-g', '-fvisibility=hidden', '-fasynchronous-unwind-tables'],
 		'owcc':	   ['-fno-short-enum', '-ffloat-store', '-g3']
 	},
 	'fast': {
@@ -240,16 +240,21 @@ def get_optimization_flags(conf):
 		linkflags+= [conf.get_flags_by_compiler(PROFILE_USE_LINKFLAGS, conf.env.COMPILER_CC)[0] % conf.options.PROFILE_USE]
 		cflags   += [conf.get_flags_by_compiler(PROFILE_USE_CFLAGS, conf.env.COMPILER_CC)[0] % conf.options.PROFILE_USE]
 
-	if conf.env.DEST_OS == 'nswitch' and conf.options.BUILD_TYPE == 'debug':
+	if conf.env.DEST_OS == 'nswitch':
-		# enable remote debugger
+		if conf.options.BUILD_TYPE == 'debug':
-		cflags.append('-DNSWITCH_DEBUG')
+			# enable remote debugger
+			cflags.append('-DNSWITCH_DEBUG')
+		# this port don't have stack printing support
+		cflags.remove('-fasynchronous-unwind-tables')
 	elif conf.env.DEST_OS == 'psvita':
 		# this optimization is broken in vitasdk
 		cflags.append('-fno-optimize-sibling-calls')
 		# remove fvisibility to allow everything to be exported by default
 		cflags.remove('-fvisibility=hidden')
+		# this port don't have stack printing support
+		cflags.remove('-fasynchronous-unwind-tables')
 
-	if conf.env.COMPILER_CC != 'msvc' and conf.env.COMPILER_CC != 'owcc':
+	if conf.env.COMPILER_CC == 'gcc' or conf.env.COMPILER_CC == 'clang' and conf.env.DEST_OS not in ['android']:
 		# HLSDK by default compiles with these options under Linux
 		# no reason for us to not do the same
 

scripts/waifulib/sdl2.py

@@ -48,6 +48,12 @@ def sdl2_configure_path(conf, path, libname):
 		conf.env[FRAMEWORKPATH] = [my_dirname(path)]
 		conf.env[FRAMEWORK] = [libname]
 		conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env[FRAMEWORK], conf.env[FRAMEWORKPATH], conf.env[INCLUDES]))
+	elif conf.env.DEST_OS == 'android':
+		# Special setup for waf called from CMake, through ExternalProject_Add
+		conf.env[INCLUDES] = [os.path.abspath(os.path.join(path, 'include'))]
+		conf.env[LIBPATH] = [os.environ['BUILD_CMAKE_LIBRARY_OUTPUT_DIRECTORY']]
+		conf.env[LIB] = [libname]
+		conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env[LIB], conf.env[LIBPATH], conf.env[INCLUDES]))
 	else:
 		conf.env[INCLUDES] = [
 			os.path.abspath(os.path.join(path, 'include')),

scripts/waifulib/xcompile.py

@@ -20,12 +20,20 @@ import os
 import sys
 
 ANDROID_NDK_ENVVARS = ['ANDROID_NDK_HOME', 'ANDROID_NDK']
-ANDROID_NDK_SUPPORTED = [10, 19, 20, 23, 25]
+ANDROID_NDK_SUPPORTED = [10, 19, 20, 23, 25, 27, 28]
 ANDROID_NDK_HARDFP_MAX = 11 # latest version that supports hardfp
 ANDROID_NDK_GCC_MAX = 17 # latest NDK that ships with GCC
 ANDROID_NDK_UNIFIED_SYSROOT_MIN = 15
 ANDROID_NDK_SYSROOT_FLAG_MAX = 19 # latest NDK that need --sysroot flag
-ANDROID_NDK_API_MIN = { 10: 3, 19: 16, 20: 16, 23: 16, 25: 19 } # minimal API level ndk revision supports
+ANDROID_NDK_API_MIN = {
+	10: 3,
+	19: 16,
+	20: 16,
+	23: 16,
+	25: 19,
+	27: 19,
+	28: 19,
+} # minimal API level ndk revision supports
 
 ANDROID_STPCPY_API_MIN = 21 # stpcpy() introduced in SDK 21
 ANDROID_64BIT_API_MIN = 21 # minimal API level that supports 64-bit targets
@@ -50,6 +58,7 @@ class Android:
 		self.api = api
 		self.toolchain = toolchain
 		self.arch = arch
+		self.exe = '.exe' if sys.platform.startswith('win32') or sys.platform.startswith('cygwin') else ''
 
 		for i in ANDROID_NDK_ENVVARS:
 			self.ndk_home = os.getenv(i)
@@ -196,10 +205,10 @@ class Android:
 
 	def gen_toolchain_path(self):
 		if self.is_clang():
-			triplet = '%s%d-' % (self.ndk_triplet(llvm_toolchain = True), self.api)
+			base = ''
 		else:
-			triplet = self.ndk_triplet() + '-'
+			base = self.ndk_triplet() + '-'
-		return os.path.join(self.gen_gcc_toolchain_path(), 'bin', triplet)
+		return os.path.join(self.gen_gcc_toolchain_path(), 'bin', base)
 
 	def gen_binutils_path(self):
 		if self.ndk_rev >= 23:
@@ -215,7 +224,11 @@ class Android:
 				s = environ['CC']
 
 			return '%s --target=%s%d' % (s, self.ndk_triplet(), self.api)
-		return self.gen_toolchain_path() + ('clang' if self.is_clang() else 'gcc')
+
+		if self.is_clang():
+			return '%s --target=%s%d' % (self.gen_toolchain_path() + 'clang' + self.exe, self.ndk_triplet(), self.api)
+
+		return self.gen_toolchain_path() + 'gcc'
 
 	def cxx(self):
 		if self.is_host():
@@ -226,19 +239,33 @@ class Android:
 				s = environ['CXX']
 
 			return '%s --target=%s%d' % (s, self.ndk_triplet(), self.api)
-		return self.gen_toolchain_path() + ('clang++' if self.is_clang() else 'g++')
+
+		if self.is_clang():
+			return '%s --target=%s%d' % (self.gen_toolchain_path() + 'clang++' + self.exe, self.ndk_triplet(), self.api)
+
+		return self.gen_toolchain_path() + 'g++'
 
 	def strip(self):
 		if self.is_host():
 			environ = getattr(self.ctx, 'environ', os.environ)
-
 			if 'STRIP' in environ:
 				return environ['STRIP']
 			return 'llvm-strip'
 
 		if self.ndk_rev >= 23:
-			return os.path.join(self.gen_binutils_path(), 'llvm-strip')
+			return os.path.join(self.gen_binutils_path(), 'llvm-strip' + self.exe)
-		return os.path.join(self.gen_binutils_path(), 'strip')
+		return os.path.join(self.gen_binutils_path(), 'strip' + self.exe)
+
+	def ar(self):
+		if self.is_host():
+			environ = getattr(self.ctx, 'environ', os.environ)
+			if 'AR' in environ:
+				return environ['AR']
+			return 'llvm-ar'
+
+		if self.ndk_rev >= 23:
+			return os.path.join(self.gen_binutils_path(), 'llvm-ar' + self.exe)
+		return os.path.join(self.gen_binutils_path(), 'ar' + self.exe)
 
 	def system_stl(self):
 		# TODO: proper STL support
@@ -336,7 +363,7 @@ class Android:
 			ldflags += ['-lgcc']
 
 		if self.is_clang() or self.is_host():
-			ldflags += ['-stdlib=libstdc++']
+			ldflags += ['-stdlib=libstdc++', '-lc++abi']
 		else: ldflags += ['-no-canonical-prefixes']
 
 		if self.is_arm():
@@ -521,25 +548,33 @@ def configure(conf):
 
 		valid_archs = ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'aarch64']
 
+		if values[0] == 'arm64-v8a':
+			values[0] = 'aarch64'
+
 		if values[0] not in valid_archs:
 			conf.fatal('Unknown arch: %s. Supported: %r' % (values[0], ', '.join(valid_archs)))
 
 		conf.android = android = Android(conf, values[0], values[1], int(values[2]))
+
 		conf.environ['CC'] = android.cc()
 		conf.environ['CXX'] = android.cxx()
 		conf.environ['STRIP'] = android.strip()
+		conf.environ['AR'] = android.ar()
 		conf.env.CFLAGS += android.cflags()
 		conf.env.CXXFLAGS += android.cflags(True)
 		conf.env.LINKFLAGS += android.linkflags()
 		conf.env.LDFLAGS += android.ldflags()
 
+		from waflib.Tools.compiler_c import c_compiler
+		from waflib.Tools.compiler_cxx import cxx_compiler
+		c_compiler['win32'] = ['clang' if android.is_clang() or android.is_host() else 'gcc']
+		cxx_compiler['win32'] = ['clang++' if android.is_clang() or android.is_host() else 'gxx']
+
 		conf.env.HAVE_M = True
 		if android.is_hardfp():
 			conf.env.LIB_M = ['m_hard']
 		else: conf.env.LIB_M = ['m']
 
-		conf.env.PREFIX = '/lib/%s' % android.apk_arch()
-
 		conf.msg('Selected Android NDK', '%s, version: %d' % (android.ndk_home, android.ndk_rev))
 		# no need to print C/C++ compiler, as it would be printed by compiler_c/cxx
 		conf.msg('... C/C++ flags', ' '.join(android.cflags()).replace(android.ndk_home, '$NDK/'))