vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable gnustl_static when not needed

Browse source
This commit is contained in:
mittorn 2017-03-28 22:47:19 +00:00
parent b3777bd7c0
commit 9613276658
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
jni/Application.mk
View file

@ -10,8 +10,6 @@ else
APP_PLATFORM := android-9
endif
APP_STL := gnustl_static
# if non-zero, works only if single ABI selected
XASH_THREAD_NUM ?= 0
@ -41,6 +39,7 @@ APP_ABI := x86 armeabi armeabi-v7a-hard
APP_MODULES := xash menu client server NanoGL gpgs_support
ifeq ($(GOOGLE_PLAY_BUILD),1)
APP_STL := gnustl_static
APP_MODULES += libgpg-1
CFLAGS_OPT += -DGOOGLE_PLAY_BUILD
endif

2
jni/src/Xash3D/xash3d

@ -1 +1 @@
Subproject commit d5db3fd807075e21ea19bd99cf338fd829a1f921
Subproject commit 4baf8e58a95255bda04ef6e03ec1d01665e80c4a