flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Just a quick update for the files you need to compile for Android.

Browse Source
This commit is contained in:
STRWarrior
2013-12-23 16:56:21 +01:00
parent 5af74fe77c
commit 1bd1696ceb
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android/jni/app-android.cpp
View File

@@ -11,8 +11,9 @@
#include <assert.h>
#include "OSSupport/CriticalSection.h"
#include "OSSupport/MakeDir.h"
#include "OSSupport/File.h"
#include "ToJava.h"
#include "inifile/iniFile.h"
#include "Root.h"
#include "WebAdmin.h"
@@ -84,7 +85,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeOnCreate( JNIEnv* env,
//__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "Logging from C++!");
g_CriticalSection.Unlock();
mkdir("/sdcard/mcserver", S_IRWXU | S_IRWXG | S_IRWXO);
cFile::CreateFolder("/sdcard/mcserver");
pRoot = new cRoot();
pRoot->Start();
@@ -105,7 +106,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeCleanUp( JNIEnv* env,
__android_log_print(ANDROID_LOG_ERROR,"MCServer", "pRoot: %p", pRoot);
if( pRoot != NULL )
{
pRoot->ExecuteConsoleCommand("stop");
pRoot->QueueExecuteConsoleCommand("stop");
}
}
@@ -122,9 +123,10 @@ extern "C" jboolean Java_com_mcserver_MCServerActivity_NativeIsServerRunning( JN
extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz )
{
if( pRoot != NULL && pRoot->GetWebAdmin() != NULL )
cIniFile IniFile;
if (IniFile.ReadFile("/sdcard/mcserver/webadmin.ini"))
{
return pRoot->GetWebAdmin()->GetPort();
return IniFile.GetValueI("WebAdmin", "Port");
}
return 0;
}