Commit Graph

145 Commits

Author SHA1 Message Date
Maksim Gamarnik e4364bcff6 Update Makefile
Add ARMv8 (not working now!)
2016-02-08 23:42:41 +02:00
Maksim Gamarnik 1ac7f0dbc5 Very big update! MultiCraft 1.1 | Part 1/3
Joystick.
environment.cpp improve (thanks @Bremaweb)
Improving the management interface.
The new font.
Settings to improve performance.
Improvements ellementov size on larger phones.
A lot of small fixes and improvements.
2016-02-07 03:11:12 +02:00
Maksim Gamarnik 4327fab167 Fix OpenAl, -O3 optimisation, fix LevelDB disabling 2016-02-04 13:27:56 +02:00
Maksim Gamarnik af41a0321c Pre-release 2016-02-01 18:11:26 +02:00
Maksim Gamarnik 18c6b747b6 Merge branch 'master' of https://github.com/minetest/minetest 2016-01-31 20:57:03 +02:00
est31 ef779b0ab6 Fix compilation warning if compiling for android with c++11 2016-01-23 06:26:58 +01:00
Duane Robertson 3c6b2ffb10 Add Valleys mapgen. 2016-01-14 05:04:29 +00:00
ubulem ab26e30b68 MultiCraft instead SnowCraft in strings 2015-12-30 18:25:01 +03:00
berkut dc3d9784f9 Bunch of actual files 2015-12-29 23:10:33 +03:00
berkut 927e063e47 old files removed 2015-12-29 23:08:30 +03:00
Maksim Gamarnik a2251f0f79 MultiCraft 1.0.2 2015-12-27 22:55:32 +02:00
Sapier 9c9b02ca8a Android: shorten initial progress bar text way more simple 2015-12-23 21:01:35 +01:00
est31 98d16e0d9a Android: Tell make about sub-makes to speed up build
Before, sub-makes called by make were called without make knowing they
were sub-makes. This however led make's jobserver not do its tasks,
and the build process ended up with inefficient parralelisation. This
commit fixes this by applying the two ways the make manual tells
about: putting + to the start of the line (used when ndk-build is
invoked), and exchanging "make" with "$(MAKE)".

Before, make complained with messages like:

make[2]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.

This complaint can now only been seen for openssl. openssl has issues
if make gets exchanged with $(MAKE): if exchanged, above error message
is multiplied for various subdirs of the openssl source tree.

On a 4 core box, "make -j 4" build time from "make clean_all" cleaned
source tree could be improved from 15:34 minutes to 10:45 minutes.
This means a speedup of 45%.
2015-12-23 06:17:42 +01:00
ShadowNinja b4eb614d31 Android: Fix extra files being copied to the APK
dcb91cf0c0 hacked around the biggest issue
this caused, but wasted a lot of CPU time and disk space  It also still
included a lot of other unwanted files.  This removes all of `doc/` except
the license, and also removes the server list.
2015-12-20 12:48:55 +01:00
Sapier bde6194638 Android: Remove unused build target curl_binary 2015-12-17 23:00:51 +01:00
Sapier dcb91cf0c0 Android: Don't put html docs to apk 2015-12-17 23:00:43 +01:00
Sapier a3fd167dda Android: Remove non freetype fonts from apk 2015-12-17 23:00:31 +01:00
Maksim Gamarnik b05a829924 Fix 2015-12-15 14:05:18 +02:00
est31 6133b2bc45 Fix android build
Fix android build since commit

696148e298 "Fix Event implementation"

by @ShadowNinja.

Fixes #3444. Thanks @kwolekr for pointing out the fix.
2015-12-11 11:24:26 +01:00
Maksim Gamarnik 9251e980f8 Merge and Fix 2015-12-11 11:18:54 +02:00
Maksim Gamarnik e150219b9d Merge last minetest commits 2015-11-27 12:57:52 +02:00
Maksim Gamarnik 4edb331124 Update 1 2015-11-27 12:03:23 +02:00
est31 2f58e4d962 Android: hardcode irrlicht revision, update other dependencies
Recent irrlicht revisions break the build, hardcode the revision to a working one
until upstream publishes a working version. See issue #3366 for
a discussion about this.

Also update dependencies to current versions.
2015-11-16 17:33:01 +01:00
paramat 76c9abe4c8 Mapgen: Add flat mapgen in hidden form 2015-11-11 09:37:54 +00:00
Maksim Gamarnik 58a0ca7ed0 Fix 2015-11-10 21:14:24 +02:00
Maksim Gamarnik cece4a6685 Android update 2015-11-10 20:39:17 +02:00
Maksim Gamarnik bef9573aeb Merge last Minetest commits 2015-11-10 20:29:00 +02:00
Maksim Gamarnik d3d35550f7 Fix makefile 2015-11-10 19:18:32 +02:00
Maksim Gamarnik 9012ac8f22 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
est31 49bda7f98d Android: statically load iconv library
Fixes #3291

Thanks to @arpruss for reporting the bug, and suggesting the fix.

Also, remove trailing whitespaces.
2015-10-24 20:47:02 +02:00
paramat d152b55971 Android/Mapgen: Add fractal mapgen file to android makefiles 2015-10-06 22:32:13 +01:00
est31 183d0d5633 Update leveldb git url
Google code was shut down, project moved to github.
2015-09-08 21:45:16 +02:00
ShadowNinja 67d38a303b Add setting for mods to copy to Android app 2015-08-24 14:37:14 -04:00
ShadowNinja 32e4f4b32d Fix Android build of threading sources 2015-08-24 11:20:53 -04:00
ShadowNinja e4bff8be94 Clean up threading
* Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
2015-08-23 22:04:06 -04:00
est31 6a1047d8c1 Fix wrong android versionName
Before, android versionName was set to "...13", which made the f-droid build fail.
2015-08-21 22:47:04 +02:00
est31 d44fceac7e Bump version to 0.4.13 2015-08-20 04:02:00 +02:00
Maksim Gamarnik 2a3fb395be Update libs, performance improve, update gui 2015-08-16 17:07:40 +03:00
berkut f877bda0b6 Fixed restart when launched by shortcut. Moved dialogs to MainActivity. Other minor improvements 2015-08-14 10:28:51 +03:00
est31 47225346be Android: fix sound issue, and gitignore
Previously, sound failed due to errors with hardfp abi build
instructions. As the problem couldn't be found, the softfp
compatible abi was chosen instead.

This move will cause a small performance overhead, but due to the
abi being armeabi-v7a, the internal calculations will still be done
using the FPU.

We also fix some issues with ABI information passing. However, the
fixes aren't sufficient to get sound working.

The patch also fixes an issue with the gitignore file.
2015-08-02 19:23:17 +02:00
est31 c39a85a88d Android: Add githash header to spare rebuilds after new commits
Before, android_version.h got changed at every new commit. Now, we
only change it with new minetest releases. Analogous to how cmake
does it,  we add an android_version_githash.h file that communicates
the git hash to C++ code.

Also, unify VERS_MAJOR, VERS_MINOR and VERS_PATCH variable
calculation inside the whole makefile.
2015-08-01 20:42:07 +02:00
est31 e29b61ecd4 Android: speed up rebuild, and prevent race condition fail
Speeding up rebuild:

Before, we've written the android_version.h file at every rebuild.
As it thought the file's content has changed, make has rebuilt files
in the source tree that depended on that header file during rebuild,
causing lots of files being rebuilt without there being a reason.

The reasoning of make can be observed by passing -d and V=1 params
to the ndk-build command. You then got logging entries like:

Prerequisite `jni/src/android_version.h' is newer than target `obj/local/armeabi-v7a-hard/objs-debug/minetest/jni/src/areastore.o'.

Preventing race condition build fail:

Before, there was a race condition, where, if the prep_srcdir target
was executed in parallel with the $(ROOT)/jni/src/android_version.h
one, it could happen that the jni/src directory was nonexistent, and
we were trying to write into a file inside. This resulted in a build
failue:

/bin/sh: 1: cannot create [...]/jni/src/android_version.h: Directory nonexistent

Additionally, we now don't remove the link to src/ needlessly anymore.
Keeping this wouldn't have affected the rebuild, but this way its
more proper.
2015-07-31 10:12:20 +02:00
est31 7217fd32eb Fix 0.4.11 githash for android
Also make only one >-redirection, sparing repetition.
Also, use cut instead of awk, which is shorter and should be a bit faster.
2015-07-31 04:51:57 +02:00
est31 eb3aac20c8 Android: fix horrible libiconv build
Before, our libiconv build was a joke. We first called configure for our own build host system,
then called make, before we executed a Android.mk script we provided as patch. The first "native make"
always failed, and the LIBICONV_LIB file setting in our Makefile didn't match the built one,
resulting in an always-rebuild of iconv.

This commit cleans up this total mess, removes the double-build, and the Android.mk, and properly calls
./configure with the according target platform, and uses a built toolchain.

As we have to deal with the android bug "NDK: Support for prebuild libs with full sonames"
https://code.google.com/p/android/issues/detail?id=55868
as the 2013 patch
https://lists.gnu.org/archive/html/libtool-patches/2013-06/msg00002.html
by Google's David Turner wasn't inside the 2011 libtool, we pass -avoid-version to
libtool.

Thanks to the proper build, wide_to_utf8 works for android now, removing us of the need to disable it.
2015-07-29 15:59:06 +02:00
est31 f97c2702a2 Android: Fix minor makefile bugs
Fix commenting happening thanks to missing quotes and dereference variable the right way,
to get rid of a compile error.
2015-07-29 15:53:23 +02:00
berkut ae0860ccc9 CPU arch to lower case 2015-07-27 21:53:08 +03:00
Bektur Mambetov d0bdd4071a Version check, help dialog were changed. ANR after screen off fixed. CPU check was added. Locale check was added 2015-07-27 17:38:06 +03:00
est31 c30a2d6854 Add AreaStore data structure 2015-07-27 06:42:56 +02:00
Maksim Gamarnik e1bd8ea826 Last for v.1.0.1 commit - FINAL 2015-07-17 21:48:57 +03:00
Maksim Gamarnik 169db877b8 Update textures and rename License notice
Update gamecontrol textures
Compress more textures
Update doc
Update header and icon
2015-07-10 17:14:51 +03:00