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

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1377 0a769ca7-a7f5-676a-18bf-c427514a06d6

Browse Source
This commit is contained in:
faketruth 2013-04-09 20:28:57 +00:00
parent 46197e3be6
commit cec6bba19f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?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="com.mcserver" package="com.mcserver"
android:versionCode="2" android:versionCode="3"
android:versionName="r1049" > android:versionName="r1375" >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

4
Android/jni/Android.mk
View File

@ -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 := $(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 %.cpp,../%.cpp,$(LOCAL_SRC_FILES))
LOCAL_SRC_FILES := $(patsubst %.c,../%.c,$(LOCAL_SRC_FILES)) LOCAL_SRC_FILES := $(patsubst %.c,../%.c,$(LOCAL_SRC_FILES))
LOCAL_SRC_FILES += app-android.cpp ToJava.cpp LOCAL_SRC_FILES += app-android.cpp ToJava.cpp
LOCAL_CFLAGS := -DANDROID_NDK \ LOCAL_CFLAGS := -DANDROID_NDK \
-ffast-math \
-O3 \ -O3 \
-funroll-loops \ -funroll-loops \
-mfloat-abi=softfp -mfpu=neon \ -mfloat-abi=softfp -mfpu=neon \
@ -37,6 +36,7 @@ LOCAL_C_INCLUDES := ../source \
../squirrel_3_0_1_stable/include \ ../squirrel_3_0_1_stable/include \
../squirrel_3_0_1_stable \ ../squirrel_3_0_1_stable \
../squirrel_3_0_1_stable/sqrat \ ../squirrel_3_0_1_stable/sqrat \
../expat/ \
.. \ .. \

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

@ -105,7 +105,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeCleanUp( JNIEnv* env,
__android_log_print(ANDROID_LOG_ERROR,"MCServer", "pRoot: %p", pRoot); __android_log_print(ANDROID_LOG_ERROR,"MCServer", "pRoot: %p", pRoot);
if( pRoot != NULL ) if( pRoot != NULL )
{ {
pRoot->ServerCommand("stop"); pRoot->ExecuteConsoleCommand("stop");
} }
} }