Commit Graph

374 Commits

Author SHA1 Message Date
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
Maksim Gamarnik bfeb308a13 rm doc on apk and update SQLite 2015-07-05 22:21:47 +03:00
RealBadAngel ffd16e3fec Add minimap feature 2015-06-27 03:42:01 +02:00
est31 a31d08be55 Android: use loop inside makefile to spare repetition 2015-06-20 07:48:17 +02:00
est31 572990dcd3 Add utf-8 conversion utilities and re-add intlGUIEditBox 2015-06-13 19:49:55 +02:00
Maksim Gamarnik 1e52126567 Small update Makefile 2015-06-13 00:41:26 +03:00
Maksim Gamarnik 0ac3859a39 Update Makefile 2015-06-12 22:29:50 +03:00
est31 c849d32a10 Reposition irrlicht timestamp in makefile 2015-06-11 23:56:54 +02:00
Bektur Mambetov 210822e4bb unused timer have been removed 2015-06-02 15:25:52 +03:00
Maksim Gamarnik 6d8a181f19 Remove MtNativeActivity 2015-06-01 09:48:26 +03:00
Maksim Gamarnik 83da0cce6f rename java package 2015-06-01 00:20:48 +03:00
kwolekr 49087eab2f Split ObjDef/ObjDefManager out to objdef.cpp 2015-05-31 23:21:12 +10:00
ShadowNinja 794d3635d4 Add mod security
Due to compatibility concerns, this is temporarily disabled.
2015-05-31 23:17:44 +10:00
est31 48db412bd5 Fix libgmp for Android
Android terminated immediately after start since commit
181f7baa45
because library wasn't loaded, and libminetest.so required
libgmp.so.10 instead of libgmp.so.

The second issue has been solved by the linker flags.
2015-05-31 23:16:07 +10:00
est31 d39358f9d2 Make early protocol auth mechanism generic, and add SRP
Adds everything needed for SRP (and everything works too),
but still deactivated, as protocol v25 init packets aren't final yet.
Can be activated by changing the LATEST_PROTOCOL_VERSION header to 25
inside networkprotocol.h.
2015-05-31 23:14:05 +10:00
est31 8135f89e21 Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.

Conflicts:
	README.txt
	build/android/Makefile
2015-05-31 23:13:54 +10:00
Bektur Mambetov 6d9fe6e728 Optimization. Duplicate code in dialogs removed 2015-05-28 12:26:55 +03:00
berkut 456a0b4c26 instruction updated 2015-05-27 21:51:42 +03:00
Bektur Mambetov 3df382f825 transparent dialog. Some renaming. Preferene big optimization 2015-05-27 19:27:49 +03:00
Maksim Gamarnik c7b69b0483 Small change 2015-05-23 14:40:31 +03:00
OttoLidenbrock 3df9f38901 Update android makefile 2015-05-23 21:08:43 +10:00
kwolekr 6c5a6967ec Split ObjDef/ObjDefManager out to objdef.cpp 2015-05-18 22:30:25 -04:00
ShadowNinja 3a8c788880 Add mod security
Due to compatibility concerns, this is temporarily disabled.
2015-05-16 18:32:31 -04:00
OttoLidenbrock 6a18586475 Fix previous Makefile commit (it didn't work) 2015-05-15 21:54:05 +10:00
Maksim Gamarnik 86720e755d New SQLite on Android build 2015-05-15 14:47:40 +03:00
OttoLidenbrock 47b38aa9c9 Only include files.zip in APK 2015-05-15 21:45:05 +10:00
OttoLidenbrock 14f92a18de add ver.txt 2015-05-15 21:16:20 +10:00
OttoLidenbrock ff09365cd0 Remove usage of pushd/popd from android makefile so Debian can work (assuming zip is installed) 2015-05-15 20:49:54 +10:00
OttoLidenbrock ca5f746c50 Update English in strings.xml 2015-05-15 19:06:20 +10:00
est31 33a633a631 Fix libgmp for Android
Android terminated immediately after start since commit
181f7baa45
because library wasn't loaded, and libminetest.so required
libgmp.so.10 instead of libgmp.so.

The second issue has been solved by the linker flags.
2015-05-15 05:08:59 +02:00
kwolekr a33092eda6 Tests: Add schematic unittests
Improve schematic file-saving interface
Add ability to create temporary test files
2015-05-13 17:01:33 +10:00
kwolekr ebbaba6907 Tests: Add NodeResolver unittests
Minor misc. NodeResolver cleanups
Prefix faux content type constants for testing with t_ to avoid
confusion or name collisions
2015-05-13 17:00:53 +10:00
Maksim Gamarnik 6d3dc6ce06 New MainMenu, update WversionManager, Makefile change
New MainMenu by 4aiman
WVersionManager - 1.3
Makefile - rename output apk
2015-05-12 10:59:17 +03:00
est31 82e35edff5 Make early protocol auth mechanism generic, and add SRP
Adds everything needed for SRP (and everything works too),
but still deactivated, as protocol v25 init packets aren't final yet.
Can be activated by changing the LATEST_PROTOCOL_VERSION header to 25
inside networkprotocol.h.
2015-05-11 18:40:27 +02:00
est31 181f7baa45 Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.
2015-05-11 17:48:33 +02:00
OttoLidenbrock e8a7a9eb09 Get rid of PO files 2015-05-10 20:46:25 +10:00
OttoLidenbrock 9c43faae05 Fix bug with Zip file creation and extraction 2015-05-10 19:23:35 +10:00
OttoLidenbrock a497e87a96 Fix bugs with package name directory and zip file 2015-05-10 19:00:55 +10:00
Maksim Gamarnik 102e9bea51 Wvm add 2015-05-10 18:03:54 +10:00
Maksim Gamarnik 0b51656f9b Fix merge java part 2015-05-10 18:03:54 +10:00
OttoLidenbrock 109b60c0c7 Merge java part 2015-05-10 18:03:54 +10:00
OttoLidenbrock f369c99db4 Update makefile, default game and create Files.zip 2015-05-10 18:01:55 +10:00
kwolekr 2dba29ebf2 Tests: Add schematic unittests
Improve schematic file-saving interface
Add ability to create temporary test files
2015-05-08 00:55:42 -04:00
kwolekr b45df9d6a7 Tests: Add NodeResolver unittests
Minor misc. NodeResolver cleanups
Prefix faux content type constants for testing with t_ to avoid
confusion or name collisions
2015-05-05 12:00:36 -04:00
kwolekr 273e1e28b0 Tests: Add ObjDef unittests 2015-05-04 16:52:10 +10:00
kwolekr e01edfe9ef Fix MSVC compatibility
Make sure to include random unittests in android builds, too
Use SWAP() macro
Ensure that negative ranges are tested as well in random unittests
2015-05-04 16:51:51 +10:00
kwolekr 8f38f8255c Tests: Add ObjDef unittests 2015-05-03 22:19:35 -04:00
Maksim Gamarnik d91f322e25 Update Makefile
Update CURL,
Change default game name
Min APP_PLATFORM = 16 (JB 4.1).
2015-05-01 14:32:08 +03:00
OttoLidenbrock c842f924c3 Change version again 2015-05-01 20:51:51 +10:00
OttoLidenbrock 17a5ed31b2 Stop using broken github hash
Version is now MultiCraft 1.0.1
(ANDROID_VERSION_CODE 101)
2015-05-01 20:07:45 +10:00
kwolekr 37ca3212ee Fix MSVC compatibility
Make sure to include random unittests in android builds, too
Use SWAP() macro
Ensure that negative ranges are tested as well in random unittests
2015-04-29 13:20:01 -04:00
OttoLidenbrock d649afa044 Merge upstream
Conflicts:
	builtin/mainmenu/tab_simple_main.lua
	src/client/clientlauncher.cpp
	src/game.cpp
	src/guiEngine.cpp
2015-04-29 19:59:54 +10:00
kwolekr 7220ca906d Tests: Modularize unit testing
Split unit tests into separate files under src/unittest/
Give better unittest diagnostics
Clean up some code
2015-04-26 15:08:54 -04:00
OttoLidenbrock 8cf938c928 Change project name and version (not android yet)
Update package Vendor and Email and version number
Change version to 1.0.1

Partially change project name

Changed android version code to 1
2015-04-27 00:54:48 +10:00
Craig Robbins 9527984dbc Move globals from main.cpp to more sane locations
Move debug streams to log.cpp|h

Move GUI-related globals to clientlauncher

Move g_settings and g_settings_path to settings.cpp|h

Move g_menuclouds to clouds.cpp|h

Move g_profiler to profiler.cpp|h
2015-04-01 23:04:25 +10:00
Aaron Suen 6d61375cc7 Clean scaling pre-filter for formspec/HUD. 2015-04-01 00:01:05 -04:00
Craig Robbins 5ee0d8ac81 Fix Android build-related bugs
E.g. Sound and freetype always being disabled, redefinition of pre-processor directives
2015-03-29 22:27:01 +10:00
ShadowNinja 93fcab952b Clean up and tweak build system
* Combine client and server man pages.
  * Update unit test options and available databases in man page.
  * Add `--worldname` to man page.
  * Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
  * Disable server build by default on all operating systems.
  * Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
  * Enable LevelDB, Redis, and FreeType detection by default.
  * Remove the `VERSION_PATCH_ORIG` hack.
  * Add option to search for and use system JSONCPP.
  * Remove broken LuaJIT version detection.
  * Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
  * Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
  * Clean up style of CMake files.
2015-03-27 15:00:48 -04:00
est31 15d9cd3a6f Fix Android build on 32 bit
Remove the --system=linux-x86_64 which isn't neccessary on 64 bit,
as, when given no --system parameter, the standalone-toolchain.sh script
figures out the platform on itself. Naturally, the hardcoded setting broke
android building on 32 bit systems.
2015-03-23 14:11:39 +10:00
Loic Blot 94b3950958 Remove Android makefile ugly make -j hack 2015-03-17 15:48:48 +01:00
Loic Blot ceac41ed6e Bump android version code 2015-03-16 20:37:31 +01:00
Loic Blot b560294050 Rename packethandler/{client,server}.cpp to {client,server}packethandler.cpp
* Requested by @Zeno-
* Approved by @nerzhul
2015-03-16 10:19:19 +01:00
Loic Blot 2bc0165652 Android Makefile update backported from stable-0.4 with minor changes 2015-03-15 11:21:34 +01:00
Loic Blot 155116852a Android: Backport changes from stable-0.4 2015-03-14 19:59:14 +01:00
Loic Blot aa085bf222 Android: fix package name in JAVA sources 2015-03-14 18:52:31 +01:00
Loic Blot 783e15f389 Fix package name in AndroidManifest.xml 2015-03-14 18:41:36 +01:00
Loic Blot 1488542968 AndroidManifest.xml version bump 2015-03-14 18:28:02 +01:00
Maksim Gamarnik c788b17322 Update Android Makefile
ARMv7 default build
Update curl
Update OpenSSL
2015-03-08 15:48:40 +10:00
Loic Blot 0d1eedcccc Replace std::list to std::vector into tile.cpp (m_texture_trash) and move tile.hpp to src/client/ 2015-03-05 11:59:40 +01:00
Loic Blot a0affa496d Fix android build 2015-02-21 17:37:48 +01:00
Perttu Ahola e6ad2ace10 Bump version to 0.4.12 2015-02-18 23:50:01 +01:00
Loic Blot 49f84b76bc Update missing files for Android.mk 2015-02-18 09:53:43 +01:00
Loic Blot b019221c30 Android build fix 2015-02-18 09:23:24 +01:00
Loic Blot 146f77fdb7 main.cpp rework * Move ClientLauncher class to a dedicated file * ClientLauncher now owns print_video_modes and speed_tests functions (they are only called by him) * Move GameParams to shared/gameparams.h because it's shared between server and client and launcher need to know it * Move InputHandlers class to client/inputhandler.h * Cleanup includes 2015-02-12 15:00:03 +01:00
Loic Blot 10b208f5c1 Fix Android build since a704c04f00bfea4b77550169fa08105c2ee0dfd0Oxh. ok @zeno- 2015-02-11 09:15:25 +01:00
sapier 9f52149a11 Android, build: Update curl to 7.40.00 2015-01-15 21:51:54 +01:00
Kodexky c0066a75cd Fix Android crash on keyboard connection change. 2015-01-13 23:09:57 +10:00
sapier 25235a4324 Increase stepheight on android by 0.5 to smoothen movement 2015-01-11 04:33:42 +01:00
sapier 04d4a00393 Fix armv7 using arm arch while arm uses armv7 2015-01-08 00:11:30 +01:00
sapier 2b8ed9e80c Switch android build to external sqlite3 2015-01-07 01:01:03 +01:00
sapier 083d19b3fc Fixes for android
Copy only minetest_game to apk by default
Don't copy .git and .svn folders to apk
Fix bouncing asset copy scrollbar due to long filepaths
Reenable font scaling to fix broken menu on high dpi screens
Implement minetest loglevel to android loglevel mapping
Disable touch digging while moving around
2015-01-06 16:13:39 +01:00
sapier a92c083011 Fix broken android version due to new openssl not linking correct to curl 2015-01-05 00:51:35 +01:00
sapier bf5d6e670a Switch to official openssl version and update to 1.0.1j 2015-01-04 16:57:19 +01:00
sapier 35149a10e3 Speedup initial android startup on some devices by factor 10 or more 2015-01-02 17:20:55 +01:00
kwolekr 3f83ca29d3 Bump version to 0.4.11 2014-12-24 22:28:06 -05:00
Kahrl e402aa8984 Add fontengine.cpp to Android.mk 2014-12-01 21:22:23 +01:00
KodexKy 5413ed1195 Fixes for Android build errors. Enable sensor landscape rotation.
Fix typo in Android Makefile ndk path.
Fix touchscreen parts of game.cpp to work after Zeno's refactor.
Fix isdigit and isspace overload conflict with Android Irrlicht in string.h
Enable sensor landscape rotation in Android Manifiest.
Add mapgen v5 to Android build.
Fix Makefile not checking leveldb.

Signed-off-by: Craig Robbins <kde.psych@gmail.com>
2014-11-25 13:28:51 +10:00
Kahrl 9b551d5cbc Implement WieldMeshSceneNode which improves wield mesh rendering
- Don't create and cache an extruded mesh for every (non-node) item.
  Instead use a single one per image resolution.

- For cubic nodes reuse a single wield mesh too

- Improve lighting of the wielded item

- Increase far value of wield mesh scene camera, fixes #1770

- Also includes some minor refactorings of Camera and GenericCAO.
2014-11-08 23:11:57 +01:00
kwolekr 9e811a92e7 Split up mapgen.cpp 2014-11-01 13:16:23 -04:00
ShadowNinja 6bc4cad0ed Split settings into seperate source and header files
This also cleans up settings a bit
2014-09-21 14:39:35 -04:00
sapier f6e01adab7 Makefile support for build without leveldb 2014-08-16 12:28:07 +02:00
sapier d38f6ebb9b Fix error handling on inconsistent client ready message
Fix android makefile to provide a correct dummy githash if detection fails
2014-07-16 20:01:00 +02:00
sapier 903d343b08 Fix android build after removal of indev and math mapgen 2014-07-16 13:40:30 +02:00
sapier 96f285f71e Update version numbers for 0.4.10 2014-07-06 22:39:47 +02:00
sapier b459f53ac3 Switch android to leveldb as sqlite3 is broken and fails to save any mapblock there 2014-07-06 21:27:54 +02:00
sapier 1cc40c0a7c Add support for Android 2.3+
There have been plenty of ppl involved in creating this version.
I don't wanna mention names as I'm sure I'd forget someone so I
just tell where help has been done:
- The partial android versions done by various ppl
- Testing on different android devices
- reviewing code (especially the in core changes)
- testing controls
- reviewing texts

A big thank you to everyone helping this to be completed!
2014-06-29 18:17:56 +02:00