minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Android: Backport changes from stable-0.4

This commit is contained in:
Loic Blot 2015-03-14 19:59:14 +01:00
parent aa085bf222
commit 155116852a
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/Makefile
View File

@ -26,7 +26,7 @@ GAMES_TO_COPY = minetest_game
# Android Version code # Android Version code
# Increase for each build! # Increase for each build!
################################################################################ ################################################################################
ANDROID_VERSION_CODE = 7 ANDROID_VERSION_CODE = 10
################################################################################ ################################################################################
# toolchain config for arm old processors # toolchain config for arm old processors

0
build/android/src/org/minetest/minetest/MinetestAssetCopy.java → build/android/src/net/minetest/minetest/MinetestAssetCopy.java
View File

0
build/android/src/org/minetest/minetest/MinetestTextEntry.java → build/android/src/net/minetest/minetest/MinetestTextEntry.java
View File

0
build/android/src/org/minetest/minetest/MtNativeActivity.java → build/android/src/net/minetest/minetest/MtNativeActivity.java
View File

6
src/porting_android.cpp
View File

@ -71,10 +71,10 @@ void android_main(android_app *app)
/* TODO this doesn't work as expected, no idea why but there's a workaround */ /* TODO this doesn't work as expected, no idea why but there's a workaround */
/* for it right now */ /* for it right now */
extern "C" { extern "C" {
JNIEXPORT void JNICALL Java_org_minetest_MtNativeActivity_putMessageBoxResult( JNIEXPORT void JNICALL Java_net_minetest_MtNativeActivity_putMessageBoxResult(
JNIEnv * env, jclass thiz, jstring text) JNIEnv * env, jclass thiz, jstring text)
{ {
errorstream << "Java_org_minetest_MtNativeActivity_putMessageBoxResult got: " errorstream << "Java_net_minetest_MtNativeActivity_putMessageBoxResult got: "
<< std::string((const char*)env->GetStringChars(text,0)) << std::string((const char*)env->GetStringChars(text,0))
<< std::endl; << std::endl;
} }
@ -138,7 +138,7 @@ void initAndroid()
exit(-1); exit(-1);
} }
nativeActivity = findClass("org/minetest/minetest/MtNativeActivity"); nativeActivity = findClass("net/minetest/minetest/MtNativeActivity");
if (nativeActivity == 0) { if (nativeActivity == 0) {
errorstream << errorstream <<
"porting::initAndroid unable to find java native activity class" << "porting::initAndroid unable to find java native activity class" <<