ver. 1.1.6.1 / Part 1

2017-01-12 23:14:38 +02:00 · 2017-01-12 23:14:38 +02:00 · 324651cea0
parent 79aa272620
commit 324651cea0
4 changed files with 31 additions and 29 deletions
--- a/build/android/Makefile
+++ b/build/android/Makefile
@ -29,7 +29,7 @@ TARGET_HOST = arm-linux
 TARGET_ABI = armeabi-v7a
 TARGET_LIBDIR = armeabi-v7a
 TARGET_TOOLCHAIN = arm-linux-androideabi
-TARGET_CFLAGS_ADDON = -mfpu=vfpv4-d16 -march=armv7-a -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto
+TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -march=armv7-a -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto
 TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) 
 TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch,--gc-sections
 CROSS_PREFIX = arm-linux-androideabi-
@ -42,7 +42,7 @@ CROSS_PREFIX = arm-linux-androideabi-
 # TARGET_ABI = x86
 # TARGET_LIBDIR = x86
 # TARGET_TOOLCHAIN = x86
-# TARGET_CFLAGS_ADDON = -Ofast -fdata-sections -ffunction-sections -fmodulo-sched -fmodulo-sched-allow-regmoves -fvisibility=hidden
+# TARGET_CFLAGS_ADDON = -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto
 # TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 # TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch,--gc-sections
 # TARGET_ARCH = x86
@ -81,29 +81,14 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)/timestamp
 IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
 IRRLICHT_URL_HTTP = https://github.com/zaki/irrlicht/archive/$(IRRLICHT_COMMIT).zip

-# not used now
-OPENSSL_VERSION = 1.0.2h
-OPENSSL_DIR = $(ANDR_ROOT)/deps/openssl
-OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0
-OPENSSL_TIMESTAMP = $(OPENSSL_DIR)/timestamp
-OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp
-OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
-
-CURL_VERSION = 7.51.0
+CURL_VERSION = 7.52.1
 CURL_DIR = $(ANDR_ROOT)/deps/curl
 CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
 CURL_TIMESTAMP = $(CURL_DIR)/timestamp
 CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
 CURL_URL_HTTP = http://dl.uxnr.de/mirror/curl/curl-${CURL_VERSION}.tar.bz2

-# not used now
-MPIR_DIR = $(ANDR_ROOT)/deps/mpir
-MPIR_LIB = $(MPIR_DIR)/usr/local/lib/libmpir.a
-MPIR_TIMESTAMP = $(MPIR_DIR)/timestamp
-MPIR_TIMESTAMP_INT = $(ANDR_ROOT)/deps/mpir_timestamp
-MPIR_URL_GIT = https://github.com/wbhart/mpir
-
-FREETYPE_VERSION = 2.7
+FREETYPE_VERSION = 2.7.1
 FREETYPE_DIR = $(ANDR_ROOT)/deps/freetype
 FREETYPE_LIB = $(FREETYPE_DIR)/objs/.libs/libfreetype.a
 FREETYPE_TIMESTAMP = $(FREETYPE_DIR)/timestamp
@ -117,9 +102,9 @@ 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 = 3150100
+SQLITE3_VERSION = 3160200
 SQLITE3_DIR = $(ANDR_ROOT)/deps/sqlite
-SQLITE3_URL = https://www.sqlite.org/2016/sqlite-amalgamation-$(SQLITE3_VERSION).zip
+SQLITE3_URL = https://www.sqlite.org/2017/sqlite-amalgamation-$(SQLITE3_VERSION).zip

 LUAJIT_GIT_BRANCH = v2.1
 LUAJIT_DIR = $(ANDR_ROOT)/deps/luajit
@ -128,6 +113,21 @@ LUAJIT_TIMESTAMP = $(LUAJIT_DIR)/timestamp
 LUAJIT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/luajit_timestamp
 LUAJIT_URL_GIT = https://github.com/LuaJIT/LuaJIT.git

+# not used now
+MPIR_DIR = $(ANDR_ROOT)/deps/mpir
+MPIR_LIB = $(MPIR_DIR)/usr/local/lib/libmpir.a
+MPIR_TIMESTAMP = $(MPIR_DIR)/timestamp
+MPIR_TIMESTAMP_INT = $(ANDR_ROOT)/deps/mpir_timestamp
+MPIR_URL_GIT = https://github.com/wbhart/mpir
+
+# not used now
+OPENSSL_VERSION = 1.0.2h
+OPENSSL_DIR = $(ANDR_ROOT)/deps/openssl
+OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0
+OPENSSL_TIMESTAMP = $(OPENSSL_DIR)/timestamp
+OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp
+OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
+
 ################################################################################

 ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//')
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@ -60,10 +60,10 @@ else

 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_CFLAGS += \
-mfpu=vfpv4 -march=armv7-a -Ofast \
+-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=vfpv4 -march=armv7-a -Ofast -fvisibility=hidden
+LOCAL_CXXFLAGS += -mfpu=vfpv3-d16 -march=armv7-a -Ofast -fvisibility=hidden
 LOCAL_LDFLAGS = -Wl,--no-warn-mismatch,--gc-sections
 endif

@ -76,10 +76,10 @@ endif

 ifeq ($(TARGET_ARCH_ABI),x86)
 LOCAL_CFLAGS += \
- -fno-stack-protector -Ofast \
-fno-fast-math -funsafe-math-optimizations -fno-trapping-math -ffinite-math-only -fno-rounding-math -fno-signaling-nans \
-fdata-sections -ffunction-sections -fmodulo-sched -fmodulo-sched-allow-regmoves -fvisibility=hidden
-LOCAL_CXXFLAGS += -Ofast -fdata-sections -ffunction-sections -fmodulo-sched -fmodulo-sched-allow-regmoves -fvisibility=hidden
+-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
 endif

--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@ -1,3 +1,3 @@
 APP_MODULES           := multicraft
-APP_STL               := gnustl_shared
+APP_STL               := gnustl_static
 APP_CPPFLAGS          += -fexceptions -frtti -std=c++11
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@ -347,7 +347,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_shaders", "false");
 	settings->setDefault("fullscreen", "true");
 	settings->setDefault("video_driver", "ogles1");
-	settings->setDefault("touchtarget", "false");
 	settings->setDefault("touchscreen_threshold", "20");
 	settings->setDefault("max_block_generate_distance", "3");
 	settings->setDefault("pause_fps_max", "5");
@ -369,6 +368,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("selectionbox_width", "6");
 	settings->setDefault("emergequeue_limit_diskonly", "8");
 	settings->setDefault("emergequeue_limit_generate", "8");
+	settings->setDefault("touchtarget", "true");
+	settings->setDefault("enable_3d_clouds", "false");

 	settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
 	settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
@ -413,6 +414,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("viewing_range", "50");
 	settings->setDefault("selectionbox_width", "3");
 	settings->setDefault("smooth_lighting", "true");
+	settings->setDefault("touchtarget", "false");

 	// For iPad =)
 	settings->setDefault("hud_scaling", "0.8");