MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: v.1.1.9

master
Maksim Gamarnik 2017-08-02 23:22:07 +03:00
parent 44fa6a460a
commit 262cd68229
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/android/Makefile
View File

@ -56,7 +56,7 @@ LEVELDB_TIMESTAMP = $(LEVELDB_DIR)/timestamp
LEVELDB_TIMESTAMP_INT = $(ANDR_ROOT)/deps/leveldb_timestamp
LEVELDB_URL = https://github.com/google/leveldb/archive/v$(LEVELDB_VERSION).zip
OPENAL_VERSION = 1.18.0
OPENAL_VERSION = 1.18.1
OPENAL_DIR = $(ANDR_ROOT)/deps/openal-soft
OPENAL_LIB = $(OPENAL_DIR)/libopenal.a
OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp
@ -97,7 +97,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 = 3190200
SQLITE3_VERSION = 3190300
SQLITE3_DIR = $(ANDR_ROOT)/deps/sqlite
SQLITE3_URL = https://www.sqlite.org/2017/sqlite-amalgamation-$(SQLITE3_VERSION).zip
@ -194,7 +194,7 @@ $(OPENAL_LIB): $(OPENAL_TIMESTAMP)
export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON} -fno-lto"; \
cmake . \
-DCMAKE_TOOLCHAIN_FILE=XCompile-Android.txt -DLIBTYPE=STATIC \
-DHOST=${CROSS_PREFIX} -DCMAKE_FIND_ROOT_PATH=$${TOOLCHAIN} \
-DHOST=${CROSS_PREFIX} -DCMAKE_FIND_ROOT_PATH=$${TOOLCHAIN} \
-DALSOFT_NO_CONFIG_UTIL=TRUE || exit 1; \
$(MAKE) || exit 1; \
touch ${OPENAL_TIMESTAMP}; \
@ -510,7 +510,11 @@ $(CURL_LIB): $(CURL_TIMESTAMP)
export CPPFLAGS="$${CPPFLAGS} ${TARGET_CXXFLAGS_ADDON} -fno-lto"; \
export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON} -fno-lto"; \
export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}"; \
./configure --host=${TARGET_HOST} --enable-static --disable-shared; \
./configure --host=${TARGET_HOST} --enable-static --disable-shared \
--disable-debug --disable-dependency-tracking -disable-ftp \
--disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict \
--disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp \
--disable-gopher --disable-sspi --disable-manual --disable-zlib --without-zlib; \
$(MAKE) -s || exit 1; \
touch ${CURL_TIMESTAMP}; \
touch ${CURL_TIMESTAMP_INT}; \

4
src/defaultsettings.cpp
View File

@ -369,6 +369,7 @@ void set_default_settings(Settings *settings)
#if defined(__ANDROID__) || defined(__IOS__)
settings->setDefault("screen_w", "0");
settings->setDefault("screen_h", "0");
settings->setDefault("fps_max", "35");
settings->setDefault("enable_shaders", "false");
settings->setDefault("fullscreen", "true");
settings->setDefault("video_driver", "ogles1");
@ -387,7 +388,6 @@ void set_default_settings(Settings *settings)
#endif
#ifdef __ANDROID__
settings->setDefault("fps_max", "35");
settings->setDefault("viewing_range", "30");
settings->setDefault("smooth_lighting", "false");
settings->setDefault("selectionbox_width", "6");
@ -395,6 +395,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("emergequeue_limit_generate", "8");
settings->setDefault("touchtarget", "true");
settings->setDefault("enable_3d_clouds", "false");
settings->setDefault("inventory_image_hack", "false");
settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
@ -436,7 +437,6 @@ void set_default_settings(Settings *settings)
#endif
#ifdef __IOS__
settings->setDefault("fps_max", "35");
settings->setDefault("viewing_range", "50");
settings->setDefault("selectionbox_width", "3");
settings->setDefault("smooth_lighting", "true");