From cec6bba19fddabf8c5506e5dc386f622ffe70d2a Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Tue, 9 Apr 2013 20:28:57 +0000
Subject: [PATCH] git-svn-id: http://mc-server.googlecode.com/svn/trunk@1377
 0a769ca7-a7f5-676a-18bf-c427514a06d6

---
 Android/AndroidManifest.xml | 4 ++--
 Android/jni/Android.mk      | 4 ++--
 Android/jni/app-android.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index c8c44d2f5..1de7d179a 100644
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mcserver"
-    android:versionCode="2"
-    android:versionName="r1049" >
+    android:versionCode="3"
+    android:versionName="r1375" >
     
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk
index a9cb819c3..764e57ee8 100644
--- a/Android/jni/Android.mk
+++ b/Android/jni/Android.mk
@@ -5,14 +5,13 @@ LOCAL_MODULE := mcserver
 
 
 
-LOCAL_SRC_FILES := $(shell find ../CryptoPP ../lua-5.1.4 ../jsoncpp-src-0.5.0 ../zlib-1.2.7 ../source ../squirrel_3_0_1_stable ../tolua++-1.0.93 ../iniFile ../WebServer '(' -name '*.cpp' -o -name '*.c' ')')
+LOCAL_SRC_FILES := $(shell find ../CryptoPP ../lua-5.1.4 ../jsoncpp-src-0.5.0 ../zlib-1.2.7 ../source ../squirrel_3_0_1_stable ../tolua++-1.0.93 ../iniFile ../WebServer ../expat '(' -name '*.cpp' -o -name '*.c' ')')
 LOCAL_SRC_FILES := $(filter-out %SquirrelFunctions.cpp %SquirrelBindings.cpp %cPlugin_Squirrel.cpp %cSquirrelCommandBinder.cpp %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES := $(patsubst %.cpp,../%.cpp,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES := $(patsubst %.c,../%.c,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES += app-android.cpp ToJava.cpp
 
 LOCAL_CFLAGS := -DANDROID_NDK \
-				-ffast-math \
 				-O3 \
 				-funroll-loops \
 				-mfloat-abi=softfp -mfpu=neon \
@@ -37,6 +36,7 @@ LOCAL_C_INCLUDES := ../source \
 					../squirrel_3_0_1_stable/include \
 					../squirrel_3_0_1_stable \
 					../squirrel_3_0_1_stable/sqrat \
+					../expat/ \
 					.. \
 
 
diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp
index 0e288a2b2..b34207344 100644
--- a/Android/jni/app-android.cpp
+++ b/Android/jni/app-android.cpp
@@ -105,7 +105,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->ServerCommand("stop");
+		pRoot->ExecuteConsoleCommand("stop");
 	}
 }