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

ver. 1.2.1.1

master
Maksim Gamarnik 2016-03-19 00:16:30 +02:00
parent 8f6ddcc57c
commit 596801371d
6 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
build/android/Makefile
View File

@ -4,14 +4,15 @@
# GPROF = 1
# build for build platform
APP_PLATFORM = android-16
APP_PLATFORM = android-19
# paths used for timestaps, dependencys, tree config and libs
PATHCFGFILE = path.cfg
# Android Version code
ANDROID_VERSION_CODE = 1
COMPILER_VERSION = 4.9
################################################################################
# toolchain config for ARMv7
################################################################################
@ -26,7 +27,6 @@ TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch,--gc-sections -lm_hard
TARGET_ARCH = armv7
CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.9
################################################################################
# toolchain config for ARMv8
@ -39,9 +39,8 @@ COMPILER_VERSION = 4.9
# TARGET_TOOLCHAIN = aarch64-linux-android-
# TARGET_CFLAGS_ADDON = -Ofast
# TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
# TARGET_ARCH = arm64
# TARGET_ARCH = aarch64
# CROSS_PREFIX = aarch64-linux-android-
# COMPILER_VERSION = 4.9
################################################################################
# toolchain config for x86
@ -56,17 +55,17 @@ COMPILER_VERSION = 4.9
# TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
# TARGET_ARCH = x86
# CROSS_PREFIX = i686-linux-android-
# COMPILER_VERSION = 4.9
################################################################################
ASSETS_TIMESTAMP = deps/assets_timestamp
OPENAL_FOLDER = $(ROOT)/deps/openal-soft
OPENAL_DIR = $(ROOT)/deps/openal-soft/android
OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so
OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp
OPENAL_TIMESTAMP_INT = $(ROOT)/deps/openal_timestamp
OPENAL_URL_GIT = https://github.com/Wemersive/openal-soft
OPENAL_URL_GIT = https://github.com/MoNTE48/openal-soft
OGG_DIR = $(ROOT)/deps/libvorbis-libogg-android
OGG_LIB = $(OGG_DIR)/libs/$(TARGET_ABI)/libogg.so
@ -103,12 +102,12 @@ GMP_TIMESTAMP = $(GMP_DIR)/timestamp
GMP_TIMESTAMP_INT = $(ROOT)/deps/gmp_timestamp
GMP_URL_HTTP = https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2
FREETYPE_VERSION = 2.6.2
FREETYPE_VERSION = 2.6.3
FREETYPE_DIR = $(ROOT)/deps/freetype
FREETYPE_LIB = $(FREETYPE_DIR)/objs/.libs/libfreetype.a
FREETYPE_TIMESTAMP = $(FREETYPE_DIR)/timestamp
FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp
FREETYPE_URL_HTTP = http://sourceforge.net/projects/freetype/files/freetype2/2.6.2/freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_URL_HTTP = http://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VERSION)/freetype-$(FREETYPE_VERSION).tar.bz2
ICONV_VERSION = 1.14
ICONV_DIR = $(ROOT)/deps/libiconv
@ -179,7 +178,7 @@ delconfig :
$(PATHCFGFILE) :
@echo "Please specify path of ANDROID NDK"; \
echo "e.g. /home/user/android-ndk-r10e/"; \
echo "e.g. /home/user/android-ndk-r10e/"; \
read ANDROID_NDK ; \
if [ ! -d $$ANDROID_NDK ] ; then \
echo "$$ANDROID_NDK is not a valid folder"; \
@ -239,7 +238,7 @@ $(OPENAL_LIB): $(OPENAL_TIMESTAMP)
fi
clean_openal :
$(RM) -rf ${OPENAL_DIR}
$(RM) -rf ${OPENAL_FOLDER}
$(OGG_TIMESTAMP) : ogg_download
@LAST_MODIF=$$(find ${OGG_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@ -323,7 +322,8 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) $(GMP_LIB)
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
--install-dir=$${TOOLCHAIN} --platform=${APP_PLATFORM}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
CC=${CROSS_PREFIX}gcc ./Configure enable-gmp -DL_ENDIAN -I${GMP_DIR} -L${GMP_DIR}/usr/lib android-${TARGET_ARCH};\
CC=${CROSS_PREFIX}gcc ./Configure no-ssl2 no-ssl3 no-hw enable-gmp \
-DL_ENDIAN -I${GMP_DIR} -L${GMP_DIR}/usr/lib android-${TARGET_ARCH}; \
CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend; \
CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs; \
touch ${OPENSSL_TIMESTAMP}; \
@ -434,12 +434,12 @@ $(ICONV_LIB) : $(ICONV_TIMESTAMP)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-iconv; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
--install-dir=$${TOOLCHAIN}; \
--platform=${APP_PLATFORM} --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
export CC=${CROSS_PREFIX}gcc; \
export CXX=${CROSS_PREFIX}g++; \
export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \
./configure --enable-static --disable-shared --host=${TARGET_HOST2} || exit 1; \
./configure --enable-static --disable-shared --host=${TARGET_HOST2} || exit 1; \
sed -i 's/LIBICONV_VERSION_INFO) /LIBICONV_VERSION_INFO) -avoid-version /g' lib/Makefile; \
grep "iconv_LDFLAGS" src/Makefile; \
$(MAKE) -s || exit 1; \
@ -514,11 +514,12 @@ clean_irrlicht :
$(CURL_TIMESTAMP) : curl_download
@LAST_MODIF=$$(find ${CURL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \
touch ${CURL_TIMESTAMP}; \
touch ${CURL_TIMESTAMP}; \
fi
curl_download :
@if [ ! -d "deps/curl-${CURL_VERSION}" ] ; then \
@if [ ! -d "deps/curl" ] ; then \
echo "curl sources missing, downloading..."; \
mkdir -p ${ROOT}/deps; \
cd deps; \
@ -531,7 +532,7 @@ curl_download :
curl : $(CURL_LIB)
$(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
@REFRESH=0; \
+ @REFRESH=0; \
if [ ! -e ${CURL_TIMESTAMP_INT} ] ; then \
REFRESH=1; \
fi; \
@ -550,7 +551,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-curl; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
--install-dir=$${TOOLCHAIN}; \
--platform=${APP_PLATFORM} --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
export CC=${CROSS_PREFIX}gcc; \
export CXX=${CROSS_PREFIX}g++; \
@ -569,7 +570,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
fi
clean_curl :
$(RM) -f deps/curl
$(RM) -R ${CURL_DIR}
$(GMP_TIMESTAMP) : gmp_download
@LAST_MODIF=$$(find ${GMP_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@ -610,7 +611,7 @@ $(GMP_LIB): $(GMP_TIMESTAMP)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-gmp; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
--install-dir=$${TOOLCHAIN}; \
--platform=${APP_PLATFORM} --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
export CC=${CROSS_PREFIX}gcc; \
export CXX=${CROSS_PREFIX}g++; \
@ -626,7 +627,7 @@ $(GMP_LIB): $(GMP_TIMESTAMP)
fi
clean_gmp:
$(RM) -f deps/gmp
$(RM) -R deps/gmp
sqlite3_download:
@if [ ! -d ${SQLITE3_DIR} ] ; then \
@ -641,7 +642,7 @@ sqlite3_download:
clean_sqlite3:
cd deps && $(RM) -rf ${SQLITE3_DIR} && \
$(RM) -f sqlite
$(RM) -R sqlite
$(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
@mkdir -p ${ROOT}/deps; \
@ -687,14 +688,11 @@ luajit : $(LUAJIT_LIB)
$(LUAJIT_LIB): $(LUAJIT_TIMESTAMP)
@REFRESH=0; \
if [ ! -e ${LUAJIT_TIMESTAMP_INT} ] ; then \
REFRESH=1; \
fi; \
if [ ! -e ${LUAJIT_LIB} ] ; then \
REFRESH=1; \
if [ ! -e ${LUAJIT_TIMESTAMP_INT} ] ; then \
REFRESH=1; \
fi; \
if [ ${LUAJIT_TIMESTAMP} -nt ${LUAJIT_TIMESTAMP_INT} ] ; then \
REFRESH=1; \
REFRESH=1; \
fi; \
if [ $$REFRESH -ne 0 ] ; then \
mkdir -p ${LUAJIT_DIR}; \
@ -705,7 +703,7 @@ $(LUAJIT_LIB): $(LUAJIT_TIMESTAMP)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-luajit; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
--install-dir=$${TOOLCHAIN}; \
--platform=${APP_PLATFORM} --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
export TARGET_FLAGS="${TARGET_CFLAGS_ADDON}"; \
export TARGET_LDFLAGS="${TARGET_LDFLAGS_ADDON}"; \
@ -718,7 +716,7 @@ $(LUAJIT_LIB): $(LUAJIT_TIMESTAMP)
fi
clean_luajit:
$(RM) -f deps/luajit
$(RM) -R deps/luajit
assets : $(ASSETS_TIMESTAMP)
@REFRESH=0; \
@ -762,7 +760,7 @@ clean_assets :
@$(RM) -r assets
apk: $(PATHCFGFILE) assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) \
$(LUAJIT_LIB) \
$(LUAJIT_LIB) \
$(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h \
$(ROOT)/jni/src/android_version_githash.h sqlite3_download
@export NDEBUG=$$NDEBUG; $(MAKE) manifest; \

14
build/android/jni/Android.mk
View File

@ -24,8 +24,8 @@ include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := openal
LOCAL_SRC_FILES := deps/openal-soft/android/libs/$(TARGET_LIBDIR)/libopenal.so
include $(PREBUILT_SHARED_LIBRARY)
LOCAL_SRC_FILES := deps/openal-soft/android/obj/local/$(APP_ABI)/libopenal.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := ogg
@ -83,6 +83,8 @@ LOCAL_CFLAGS += -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=
LOCAL_LDFLAGS = -Wl,--no-warn-mismatch,--gc-sections -lm_hard
endif
endif
ifdef GPROF
PROFILER_LIBS := android-ndk-profiler
LOCAL_CFLAGS += -pg
@ -321,10 +323,10 @@ LOCAL_SRC_FILES += \
# JSONCPP
LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
LOCAL_SHARED_LIBRARIES := openal ogg vorbis gmp
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto iconv luajit android_native_app_glue $(PROFILER_LIBS)
LOCAL_SHARED_LIBRARIES := ogg vorbis gmp
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto iconv luajit openal android_native_app_glue $(PROFILER_LIBS)
LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid
LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid -lOpenSLES
include $(BUILD_SHARED_LIBRARY)
@ -332,4 +334,4 @@ include $(BUILD_SHARED_LIBRARY)
ifdef GPROF
$(call import-module,android-ndk-profiler)
endif
$(call import-module,android/native_app_glue)
$(call import-module,android/native_app_glue)

2
build/android/jni/Application.mk
View File

@ -3,4 +3,4 @@ APP_MODULES := multicraft
APP_STL := gnustl_static
APP_CPPFLAGS += -fexceptions
APP_GNUSTL_FORCE_CPP_FEATURES := rtti
APP_GNUSTL_FORCE_CPP_FEATURES := rtti

6
builtin/mainmenu/init.lua
View File

@ -41,7 +41,9 @@ dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
if not (PLATFORM == "Android") then
dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
end
dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
@ -131,4 +133,4 @@ local function init_globals()
--minetest.set_background("header",minetest.formspec_escape(mm_texture.basetexturedir)..'header.png')
end
init_globals()
init_globals()

12
src/defaultsettings.cpp
View File

@ -346,7 +346,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("emergequeue_limit_generate", "8");
settings->setDefault("max_block_generate_distance", "2");
settings->setDefault("enable_3d_clouds", "false");
settings->setDefault("fps_max", "40");
settings->setDefault("fps_max", "45");
settings->setDefault("pause_fps_max", "10");
settings->setDefault("max_objects_per_block", "20");
settings->setDefault("sqlite_synchronous", "1");
@ -360,22 +360,24 @@ void set_default_settings(Settings *settings)
settings->setDefault("active_block_range", "1");
settings->setDefault("chunksize", "3");
//check for device with small screen
// check for device with small screen
float x_inches = ((double) porting::getDisplaySize().X /
(160 * porting::getDisplayDensity()));
if (x_inches < 3.5) {
settings->setDefault("hud_scaling", "0.5");
settings->setDefault("gui_scaling", "1.0");
}
else if (x_inches < 5.5) {
if (x_inches < 6.0) {
settings->setDefault("hud_scaling", "0.6");
}
else if (x_inches > 5.5) {
else
{
settings->setDefault("hud_scaling", "0.9");
settings->setDefault("mouse_sensitivity", "0.15");
}
std::stringstream anddroidfontsize;
anddroidfontsize << DEFAULT_FONT_SIZE / 3 * x_inches;
anddroidfontsize << DEFAULT_FONT_SIZE / 2.9 * x_inches;
settings->setDefault("font_size", anddroidfontsize.str());
settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");

4
src/localplayer.cpp
View File

@ -210,9 +210,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
// this shouldn't be hardcoded but transmitted from server
float player_stepheight = touching_ground ? (BS*0.6) : (BS*0.2);
#ifdef __ANDROID__
player_stepheight += (0.5 * BS);
#endif
player_stepheight += (0.6 * BS);
v3f accel_f = v3f(0,0,0);