From 817fea6330b9fceb4070b3ee83283140929b3ddc Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 11 Jun 2016 05:41:12 +0200 Subject: Fix android build Thanks to @Wayward1 for reporting the bug. Fixes #4212. --- build/android/jni/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'build/android/jni/Android.mk') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index e8534eaac..afd8c76b2 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -224,6 +224,7 @@ LOCAL_SRC_FILES := \ jni/src/util/auth.cpp \ jni/src/util/base64.cpp \ jni/src/util/directiontables.cpp \ + jni/src/util/enriched_string.cpp \ jni/src/util/numeric.cpp \ jni/src/util/pointedthing.cpp \ jni/src/util/serialize.cpp \ @@ -256,7 +257,9 @@ LOCAL_SRC_FILES := \ jni/src/settings.cpp \ jni/src/wieldmesh.cpp \ jni/src/client/clientlauncher.cpp \ - jni/src/client/tile.cpp + jni/src/client/tile.cpp \ + jni/src/client/joystick_controller.cpp \ + jni/src/irrlicht_changes/static_text.cpp # intentionally kept out (we already build openssl itself): jni/src/util/sha256.c -- cgit v1.2.3 From 3c63c3044d5e4ca36c2649c530f31622581d90fd Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 24 Jun 2016 18:15:56 -0400 Subject: Add MapSettingsManager and new mapgen setting script API functions This commit refactors the majority of the Mapgen settings system. - MapgenParams is now owned by MapSettingsManager, itself a part of ServerMap, instead of the EmergeManager. - New Script API functions added: core.get_mapgen_setting core.get_mapgen_setting_noiseparams, core.set_mapgen_setting, and core.set_mapgen_setting_noiseparams. - minetest.get/set_mapgen_params are deprecated by the above new functions. - It is now possible to view and modify any arbitrary mapgen setting from a mod, rather than the base MapgenParams structure. - MapgenSpecificParams has been removed. --- build/android/jni/Android.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'build/android/jni/Android.mk') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index afd8c76b2..a42ab76b8 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -169,6 +169,7 @@ LOCAL_SRC_FILES := \ jni/src/log.cpp \ jni/src/main.cpp \ jni/src/map.cpp \ + jni/src/map_settings_manager.cpp \ jni/src/mapblock.cpp \ jni/src/mapblock_mesh.cpp \ jni/src/mapgen.cpp \ @@ -238,6 +239,7 @@ LOCAL_SRC_FILES := \ jni/src/unittest/test_connection.cpp \ jni/src/unittest/test_filepath.cpp \ jni/src/unittest/test_inventory.cpp \ + jni/src/unittest/test_map_settings_manager.cpp \ jni/src/unittest/test_mapnode.cpp \ jni/src/unittest/test_nodedef.cpp \ jni/src/unittest/test_noderesolver.cpp \ -- cgit v1.2.3 From a4962240bdf7ddc221c477ada1c2a99c1aee3e2e Mon Sep 17 00:00:00 2001 From: Rogier-5 Date: Fri, 19 Aug 2016 20:23:30 +0200 Subject: Fix for failure to find jsoncpp in android build (#4456) Commit 4503b5 did not update the android build script. --- build/android/jni/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/android/jni/Android.mk') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index a42ab76b8..2d850385e 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \ jni/src \ jni/src/script \ jni/src/lua/src \ - jni/src/json \ + jni/src/jsoncpp \ jni/src/cguittfont \ deps/irrlicht/include \ deps/libiconv/include \ @@ -361,7 +361,7 @@ LOCAL_SRC_FILES += \ jni/src/threading/thread.cpp # JSONCPP -LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp +LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) -- cgit v1.2.3 From 7252c803e0708bd8511a5b51333983aa24a76cb2 Mon Sep 17 00:00:00 2001 From: Ner'zhul Date: Fri, 28 Oct 2016 15:37:19 +0200 Subject: Add missing remoteplayer.cpp to Android build this should fix #4683 --- build/android/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'build/android/jni/Android.mk') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 2d850385e..651fa318e 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -203,6 +203,7 @@ LOCAL_SRC_FILES := \ jni/src/porting.cpp \ jni/src/profiler.cpp \ jni/src/quicktune.cpp \ + jni/src/remoteplayer.cpp \ jni/src/rollback.cpp \ jni/src/rollback_interface.cpp \ jni/src/serialization.cpp \ -- cgit v1.2.3 From 24719c6908305c9505eafc372fb4cfbbbd2fcf70 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 7 Dec 2016 21:27:07 +0100 Subject: Android: fix build and update deps --- build/android/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'build/android/jni/Android.mk') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 651fa318e..c2186efaf 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -203,6 +203,7 @@ LOCAL_SRC_FILES := \ jni/src/porting.cpp \ jni/src/profiler.cpp \ jni/src/quicktune.cpp \ + jni/src/reflowscan.cpp \ jni/src/remoteplayer.cpp \ jni/src/rollback.cpp \ jni/src/rollback_interface.cpp \ -- cgit v1.2.3