From 92dff0178af0a787f2b605643ba21fa63b9b7c9f Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Wed, 24 Feb 2016 04:27:46 +0200 Subject: [PATCH] build2 --- build/android/Makefile | 2 +- build/android/irrlicht-optimization.patch | 5 +++-- build/android/jni/Android.mk | 6 ++++-- build/android/jni/Application.mk | 4 +++- src/defaultsettings.cpp | 6 +++--- src/touchscreengui.cpp | 4 ++-- textures/base/pack/halo.png | Bin 96 -> 96 bytes textures/base/pack/object_marker_red.png | Bin 549 -> 82 bytes 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index d7df78ce8..1255581bd 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -21,7 +21,7 @@ TARGET_HOST2 = arm-linux TARGET_ABI = armeabi-v7a-hard TARGET_LIBDIR = armeabi-v7a TARGET_TOOLCHAIN = arm-linux-androideabi- -TARGET_CFLAGS_ADDON = -mhard-float -march=armv7-a -D_NDK_MATH_NO_SOFTFP=1 -Ofast +TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=armv7-a -Ofast TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard TARGET_ARCH = armv7 diff --git a/build/android/irrlicht-optimization.patch b/build/android/irrlicht-optimization.patch index ce757bd50..79ac2031a 100644 --- a/build/android/irrlicht-optimization.patch +++ b/build/android/irrlicht-optimization.patch @@ -1,11 +1,12 @@ --- irrlicht/source/Irrlicht/Android/jni/Android.mk.orig 2016-02-15 05:33:03.000000000 +0200 +++ irrlicht/source/Irrlicht/Android/jni/Android.mk 2016-02-15 05:34:34.913711815 +0200 -@@ -11,7 +11,7 @@ +@@ -11,7 +11,8 @@ ifndef NDEBUG LOCAL_CFLAGS += -g -D_DEBUG else -LOCAL_CFLAGS += -fexpensive-optimizations -O3 -+LOCAL_CFLAGS += -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -Ofast -march=armv7-a ++LOCAL_CFLAGS += -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=armv7-a -Ofast ++LOCAL_LDFLAGS = -Wl,--no-warn-mismatch -lm_hard endif LOCAL_C_INCLUDES := ../../../include diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index a23e4a308..4f5590f95 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -80,9 +80,11 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \ ifndef NDEBUG LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer else -LOCAL_CFLAGS += -mhard-float -march=armv7-a -D_NDK_MATH_NO_SOFTFP=1 -Ofast -fno-fast-math -Wl,--gc-sections -LOCAL_LDFLAGS = -Wl,--no-warn-mismatch -lm_hard + +LOCAL_CFLAGS += -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=armv7-a -Ofast -fno-fast-math +LOCAL_LDFLAGS = -Wl,--no-warn-mismatch -lm_hard # ToDo - disable for x86! + endif ifdef GPROF diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk index c8d229826..f1c8edfd1 100644 --- a/build/android/jni/Application.mk +++ b/build/android/jni/Application.mk @@ -1,4 +1,6 @@ NDK_TOOLCHAIN_VERSION := 4.9 APP_MODULES := multicraft APP_STL := gnustl_static -APP_CPPFLAGS += -fexceptions -std=c++11 \ No newline at end of file + +APP_CPPFLAGS += -fexceptions +APP_GNUSTL_FORCE_CPP_FEATURES := rtti \ No newline at end of file diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 4dda3fc8e..f7c4069c4 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -177,7 +177,7 @@ void set_default_settings(Settings *settings) settings->setDefault("enable_shaders", "true"); settings->setDefault("repeat_rightclick_time", "0.25"); settings->setDefault("enable_particles", "true"); - settings->setDefault("enable_mesh_cache", "true"); + settings->setDefault("enable_mesh_cache", "false"); settings->setDefault("enable_minimap", "true"); settings->setDefault("minimap_shape_round", "true"); @@ -362,12 +362,12 @@ void set_default_settings(Settings *settings) float x_inches = ((double) porting::getDisplaySize().X / (160 * porting::getDisplayDensity())); if (x_inches < 3.5) { - settings->setDefault("hud_scaling", "0.55"); + settings->setDefault("hud_scaling", "0.5"); settings->setDefault("mouse_sensitivity", "0.1"); settings->setDefault("font_size","12"); } else if (x_inches < 5.5) { - settings->setDefault("hud_scaling", "0.65"); + settings->setDefault("hud_scaling", "0.6"); settings->setDefault("mouse_sensitivity", "0.1"); settings->setDefault("font_size","14"); } diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp index 3d5317d77..4051e1d75 100644 --- a/src/touchscreengui.cpp +++ b/src/touchscreengui.cpp @@ -193,7 +193,7 @@ void TouchScreenGUI::initButton(touch_gui_button_id id, rect button_rect, } static int getMaxControlPadSize(float density) { - return 280 * density * g_settings->getFloat("hud_scaling"); + return 300 * density * g_settings->getFloat("hud_scaling"); } int TouchScreenGUI::getGuiButtonSize() @@ -884,4 +884,4 @@ void TouchScreenGUI::show() return; Toggle(true); -} \ No newline at end of file +} diff --git a/textures/base/pack/halo.png b/textures/base/pack/halo.png index 6f9788d0052fa061fdca444b2027471eeb724c73..dd310be6d1773954b6f552a50dde07f159c5badb 100644 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;m;-!5Tp8;BE8X9o2jnuA1o;Ig o@P_QP19G@MT^vIy;*uqv067a77-dYInSd+?Pgg&ebxsLQ0Ji-VMF0Q* literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XtM`I$iaA@Xfn3ItAiv;- owQEBv-ar-x^izU}=_h53}y~(X&5Cd!_h7@v}+<;I*pu*`@II<=)EnC~sf|r#Qlc zq}?3=L(ae`8&IK7{m5lH_-!6~L$ zKPFF8;k$=fcZd!(DlB&44d#^n;4qo?$@j_V=5M2u2Z=(Z6d!NsE6bKaTs(iG`JFl>@S+wn-on_rYGW(-A+AsDDzQRu$0n`E}oDn{d-L8`- nHGP#FsNBYfYrF^=aTfmpw*Ie(dKrjn00000NkvXXu0mjfKg