From 6605b0702769e8620fcf13e4813b4d00ad7b4803 Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <sepulkarium45@yahoo.com>
Date: Mon, 2 Dec 2019 01:23:28 +0500
Subject: [PATCH] Turn on mobile hacks for Android by default.

---
 CMakeLists.txt    | 5 ++++-
 cl_dll/Android.mk | 2 +-
 dlls/Android.mk   | 2 +-
 wscript           | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03d3a004..4c502259 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,10 @@ else()
 	message(STATUS "Building for 32 Bit")
 endif()
 
+if(XASH_ANDROID)
+	add_definitions(-DMOBILE_HACKS)
+endif()
+
 if (MINGW)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
 	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--add-stdcall-alias")
@@ -95,7 +99,6 @@ if(NOT MSVC)
 	add_compile_options(-Wreturn-type) # GCC/Clang flag
 endif()
 
-
 if(BUILD_CLIENT)
 	add_subdirectory(cl_dll)
 endif()
diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk
index df6130ed..fb21ef55 100755
--- a/cl_dll/Android.mk
+++ b/cl_dll/Android.mk
@@ -92,7 +92,7 @@ SRCS+=./input_xash3d.cpp
 SRCS+=./scoreboard.cpp
 SRCS+=./MOTD.cpp
 INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls -I../utils/false_vgui/include
-DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w -D_snprintf=snprintf
+DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -DMOBILE_HACKS -w -D_snprintf=snprintf
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
 		 $(LOCAL_PATH)/../common \
diff --git a/dlls/Android.mk b/dlls/Android.mk
index e7fb9217..43690483 100644
--- a/dlls/Android.mk
+++ b/dlls/Android.mk
@@ -14,7 +14,7 @@ LOCAL_MODULE_FILENAME = libserver_hardfp
 endif
 
 LOCAL_CFLAGS += -D_LINUX -DCLIENT_WEAPONS -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf \
-	-fno-exceptions -DNO_VOICEGAMEMGR -w
+	-fno-exceptions -DNO_VOICEGAMEMGR -DMOBILE_HACKS -w
 
 LOCAL_CPPFLAGS := $(LOCAL_CFLAGS)
 
diff --git a/wscript b/wscript
index 15c4b175..01b6e22f 100644
--- a/wscript
+++ b/wscript
@@ -263,6 +263,9 @@ def configure(conf):
 
 	conf.define('CLIENT_WEAPONS', '1')
 
+	if conf.env.DEST_OS == 'android':
+		conf.define('MOBILE_HACKS', '1')
+
 	conf.add_subproject(["cl_dll", "dlls"])
 
 def build(bld):