diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg
index f92887631..7be9b511c 100644
--- a/project/jni/application/vcmi/AndroidAppSettings.cfg
+++ b/project/jni/application/vcmi/AndroidAppSettings.cfg
@@ -29,7 +29,7 @@ AppVersionCode=08503
 AppVersionName="0.85.03"
 CompiledLibraries="sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread vcmi"
 CustomBuildScript=n
-AppCflags='-DDATA_DIR=\\\"/sdcard/app-data/eu.vcmi\\\" -DBIN_DIR=\\\"/data/data/eu.vcmi/files\\\" -DLIB_DIR=\\\"/data/data/eu.vcmi/files\\\" -DWITH_AVCODEC_DECODE_VIDEO2=1'
+AppCflags='-DDATA_DIR=\\\"/sdcard/app-data/eu.vcmi\\\" -DBIN_DIR=\\\"/data/data/eu.vcmi/files\\\" -DLIB_DIR=\\\"/data/data/eu.vcmi/files\\\" -DWITH_AVCODEC_DECODE_VIDEO2=1 -Wstrict-aliasing -Wcast-align -Wpointer-arith -Waddress'
 AppLdflags='-lz -Ljni/application/vcmi -lvcmi'
 AppSubdirsBuild='vcmi/client vcmi/CGameInterface.cpp vcmi/CCallback.cpp'
 AppCmdline=''
diff --git a/project/jni/application/vcmi/AndroidBuild.sh b/project/jni/application/vcmi/AndroidBuild.sh
index 84afd1e1a..2940bb870 100755
--- a/project/jni/application/vcmi/AndroidBuild.sh
+++ b/project/jni/application/vcmi/AndroidBuild.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-make -j4 2>&1 | tee build.log
+make -j1 2>&1 | tee build.log
 [ -f libapplication.so ] || exit 1
 exit 0
 
diff --git a/project/jni/application/vcmi/AndroidData/vcmiserver0 b/project/jni/application/vcmi/AndroidData/vcmiserver0
index 0aff88ffd..03cfe7d3d 100644
Binary files a/project/jni/application/vcmi/AndroidData/vcmiserver0 and b/project/jni/application/vcmi/AndroidData/vcmiserver0 differ
diff --git a/project/jni/application/vcmi/AndroidData/vcmiserver1 b/project/jni/application/vcmi/AndroidData/vcmiserver1
index 7c36d6fcb..eed25e3f7 100644
Binary files a/project/jni/application/vcmi/AndroidData/vcmiserver1 and b/project/jni/application/vcmi/AndroidData/vcmiserver1 differ
diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile
index 33167518a..5b06d5de2 100644
--- a/project/jni/application/vcmi/Makefile
+++ b/project/jni/application/vcmi/Makefile
@@ -20,13 +20,10 @@ OBJS_STUPIDAI=$(patsubst %.cpp, out/%.o, $(SOURCES_STUPIDAI))
 SOURCES_GENIUSAI=$(filter-out %/ExpertSystem.cpp, $(wildcard vcmi/AI/GeniusAI/*.cpp))
 OBJS_GENIUSAI=$(patsubst %.cpp, out/%.o, $(SOURCES_GENIUSAI))
 
-SOURCES_CLIENT=$(wildcard vcmi/client/*.cpp vcmi/*.cpp)
-OBJS_CLIENT=$(patsubst %.cpp, out/%.o, $(SOURCES_CLIENT))
-
 SOURCES_ERM=$(wildcard vcmi/Scripting/ERM/*.cpp)
 OBJS_ERM=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM))
 
-all: AndroidData/vcmiserver0 # libapplication.so
+all: AndroidData/vcmiserver0
 
 AndroidData/vcmiserver0: vcmiserver.zip
 	rm -f AndroidData/vcmiserver*
@@ -45,6 +42,7 @@ $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_GENIUSAI) $(OBJS_STUPIDAI) $(OBJS_CLIENT) $(OB
 	-DBIN_DIR=\\\"/data/data/eu.vcmi/files\\\" \
 	-DLIB_DIR=\\\"/data/data/eu.vcmi/files\\\" \
 	-DWITH_AVCODEC_DECODE_VIDEO2=1 \
+	-Wstrict-aliasing -Wcast-align -Wpointer-arith -Waddress \
 	$< -o $@"
 #	-Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address
 
@@ -78,20 +76,11 @@ AI/libStupidAI.so: $(OBJS_STUPIDAI) -lvcmi
 Scripting/libvcmiERM.so: $(OBJS_ERM) -lvcmi
 	$(LINK_LIB)
 
-
 libvcmi.so: $(OBJS_LIB)
 	$(LINK_LIB)
 
-libapplication.so: $(OBJS_CLIENT) -lvcmi
-	../setEnvironment.sh sh -c \
-	"$(GCC_PREFIX)-g++ \
-	\$$LDFLAGS -L. \
-	$^ -o $@ \
-	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options" && \
-	cp $@ debug/$@
-
 clean:
-	rm -rf out debug *.so vcmiserver* AndroidData/vcmiserver* libapplication.so
+	rm -rf out debug *.so vcmiserver* AndroidData/vcmiserver* libapplication.so AI Scripting
 
 .PHONY: clean