From c40af4c4ab0541638a6079a97c601a774ed65d02 Mon Sep 17 00:00:00 2001 From: faketruth Date: Fri, 17 Aug 2012 22:20:35 +0000 Subject: Android: Pressing back button sends stop command to server Android: ToJava can call functions on Java by using JNI Android: Plugins work Android: Added android specific files to VS2008 project, but they are excluded from compiling git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cLog.cpp | 2 ++ source/cPlugin_NewLua.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/cLog.cpp b/source/cLog.cpp index d1874f7e2..57ad9b418 100644 --- a/source/cLog.cpp +++ b/source/cLog.cpp @@ -11,6 +11,7 @@ #if defined(ANDROID_NDK) #include +#include "ToJava.h" #endif @@ -130,6 +131,7 @@ void cLog::Log(const char * a_Format, va_list argList) // Print to console: #if defined(ANDROID_NDK) __android_log_vprint(ANDROID_LOG_ERROR,"MCServer", a_Format, argList); + //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line ); #else printf("%s", Line.c_str()); #endif diff --git a/source/cPlugin_NewLua.cpp b/source/cPlugin_NewLua.cpp index feba602ba..7f7f0c20c 100644 --- a/source/cPlugin_NewLua.cpp +++ b/source/cPlugin_NewLua.cpp @@ -73,7 +73,7 @@ bool cPlugin_NewLua::Initialize() ManualBindings::Bind( m_LuaState ); } - std::string PluginPath = std::string("Plugins/") + m_Directory + "/"; + std::string PluginPath = FILE_IO_PREFIX + std::string("Plugins/") + m_Directory + "/"; // Load all files for this plugin, and execute them AStringList Files = GetDirectoryContents(PluginPath.c_str()); -- cgit v1.2.3