BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Releasing android

Browse Source
This commit is contained in:
Loic Blot 2015-03-14 19:57:21 +01:00
parent 7993a403f2
commit b12f569fc6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/AndroidManifest.xml.template
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.minetest.minetest" package="net.minetest.minetest"
android:versionCode="###ANDROID_VERSION###" android:versionCode="###ANDROID_VERSION###"
android:versionName="###BASE_VERSION###.###ANDROID_VERSION###" android:versionName="###BASE_VERSION###.###ANDROID_VERSION###"
android:installLocation="auto"> android:installLocation="auto">

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 = 6 ANDROID_VERSION_CODE = 10
################################################################################ ################################################################################
# toolchain config for arm old processors # toolchain config for arm old processors

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

@ -1,4 +1,4 @@
package org.minetest.minetest; package net.minetest.minetest;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;

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

@ -1,4 +1,4 @@
package org.minetest.minetest; package net.minetest.minetest;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;

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

@ -1,4 +1,4 @@
package org.minetest.minetest; package net.minetest.minetest;
import android.app.NativeActivity; import android.app.NativeActivity;
import android.content.Intent; import android.content.Intent;

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" <<