Android: v. 1.1.7 | update jsoncpp

build/android/Makefile

@@ -102,7 +102,7 @@ ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).
 INTL_DIR = $(ANDR_ROOT)/deps/libintl/
 INTL_URL_HTTP = https://github.com/j-jorge/libintl-lite/archive/master.tar.gz
 
-SQLITE3_VERSION = 3170000
+SQLITE3_VERSION = 3180000
 SQLITE3_DIR = $(ANDR_ROOT)/deps/sqlite
 SQLITE3_URL = https://www.sqlite.org/2017/sqlite-amalgamation-$(SQLITE3_VERSION).zip
 

build/android/jni/Android.mk

@@ -61,10 +61,9 @@ else
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_CFLAGS += \
 -mfpu=vfpv3-d16 -march=armv7-a -Ofast \
--fno-fast-math -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range \
 -fvisibility=hidden -flto
 LOCAL_CXXFLAGS += -mfpu=vfpv3-d16 -march=armv7-a -Ofast -fvisibility=hidden
-LOCAL_LDFLAGS = -Wl,--no-warn-mismatch,--gc-sections
+LOCAL_LDFLAGS = -Wl,--no-warn-mismatch,--gc-sections,--icf=safe
 endif
 
 endif
@@ -77,7 +76,6 @@ endif
 ifeq ($(TARGET_ARCH_ABI),x86)
 LOCAL_CFLAGS += \
 -fno-stack-protector -Ofast \
--fno-fast-math -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range \
 -fvisibility=hidden -flto
 LOCAL_CXXFLAGS += -Ofast -fvisibility=hidden
 LOCAL_LDFLAGS = -Wl,--no-warn-mismatch,--gc-sections
@@ -285,9 +283,6 @@ LOCAL_SRC_FILES += \
 # Freetype2
 LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp
 
-# SQLite3
-LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
-
 # libIntl
 LOCAL_SRC_FILES += deps/libintl/internal/libintl.cpp
 
@@ -299,7 +294,7 @@ LOCAL_SRC_FILES += \
 		jni/src/threading/thread.cpp
 
 # JSONCPP
-LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp
+LOCAL_SRC_FILES += jni/src/jsoncpp/jsoncpp.cpp
 
 # libiconv
 LOCAL_CFLAGS += -Wno-multichar -D_ANDROID -DLIBDIR -DBUILDING_LIBICONV 
@@ -313,6 +308,11 @@ LOCAL_SRC_FILES += \
 		deps/libiconv/lib/iconv.c               \
 		deps/libiconv/libcharset/lib/localcharset.c
 
+# SQLite3
+LOCAL_CFLAGS += -fno-fast-math -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range
+
+LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
+
 LOCAL_STATIC_LIBRARIES := Irrlicht LevelDB freetype curl LuaJIT openal vorbis android_native_app_glue $(PROFILER_LIBS)
 
 LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES

src/game.cpp

@@ -1260,18 +1260,18 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
 		<< strgettext("Continue") << "]";
 #if !defined(__ANDROID__) && !defined(__IOS__)
 	if (!singleplayermode) {
-	os		<< "button_exit[3.0," << (ypos++) << ";4,0.5;btn_change_password;"
+	os		<< "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_change_password;"
 			<< strgettext("Change Password") << "]";
 	}
-	os		<< "button_exit[3.0," << (ypos++) << ";4,0.5;btn_sound;"
+	os		<< "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_sound;"
 			<< strgettext("Sound Volume") << "]";
-	os		<< "button_exit[3.0," << (ypos++) << ";4,0.5;btn_key_config;"
+	os		<< "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_key_config;"
 			<< strgettext("Change Keys")  << "]";
 #endif
 	os		<< "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_exit_menu;"
 			<< strgettext("Save and Exit") << "]";
 #ifndef __IOS__
-	os		<< "button_exit[3.0," << (ypos++) << ";4,0.5;btn_exit_os;"
+	os		<< "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_exit_os;"
 			<< strgettext("Close game") << "]";
 #endif
 	os		<< "\n;]";