diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-26 16:36:08 +0200 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-26 16:36:08 +0200 |
| commit | 987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6 (patch) | |
| tree | 3f4b98edc89c12f8aa0a96303b32f0b5f5b50dcb /Android | |
| parent | Added the block dig animation packet (patch contributed by l0udPL) (diff) | |
| download | cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.gz cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.bz2 cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.lz cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.xz cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.zst cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.zip | |
Diffstat (limited to '')
| -rw-r--r-- | Android/jni/Android.mk | 5 | ||||
| -rw-r--r-- | Android/jni/Application.mk | 5 | ||||
| -rw-r--r-- | Android/jni/app-android.cpp | 7 | ||||
| -rw-r--r-- | Android/res/drawable-hdpi/ic_launcher.png | bin | 9397 -> 12967 bytes | |||
| -rw-r--r-- | Android/res/drawable-ldpi/ic_launcher.png | bin | 2729 -> 5942 bytes | |||
| -rw-r--r-- | Android/res/drawable-mdpi/ic_launcher.png | bin | 5237 -> 7989 bytes | |||
| -rw-r--r-- | Android/res/drawable-xhdpi/ic_launcher.png | bin | 14383 -> 18851 bytes |
7 files changed, 12 insertions, 5 deletions
diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk index 6fd8d3a14..ae0123ba2 100644 --- a/Android/jni/Android.mk +++ b/Android/jni/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE := mcserver -LOCAL_SRC_FILES := $(shell find ../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 '(' -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))
@@ -16,6 +16,8 @@ LOCAL_CFLAGS := -DANDROID_NDK \ -O3 \
-funroll-loops \
-mfloat-abi=softfp -mfpu=neon \
+ -fexceptions \
+ -D_DEBUG \
LOCAL_STATIC_LIBRARIES := cpufeatures
@@ -36,6 +38,7 @@ LOCAL_C_INCLUDES := ../source \ ../squirrel_3_0_1_stable/include \
../squirrel_3_0_1_stable \
../squirrel_3_0_1_stable/sqrat \
+ .. \
LOCAL_LDLIBS := -ldl -llog
diff --git a/Android/jni/Application.mk b/Android/jni/Application.mk index c68dfe204..e00c8b5e2 100644 --- a/Android/jni/Application.mk +++ b/Android/jni/Application.mk @@ -1,4 +1,7 @@ # Build both ARMv5TE and ARMv7-A machine code. APP_MODULES := mcserver # APP_ABI := armeabi armeabi-v7a -APP_STL := stlport_static
\ No newline at end of file +#APP_STL := stlport_static + +APP_STL := gnustl_static +APP_CPPFLAGS := -frtti
\ No newline at end of file diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp index a6fb1baf2..d90374225 100644 --- a/Android/jni/app-android.cpp +++ b/Android/jni/app-android.cpp @@ -10,11 +10,12 @@ #include <float.h>
#include <assert.h>
-#include "cCriticalSection.h"
-#include "cRoot.h"
-#include "cMakeDir.h"
+#include "OSSupport/CriticalSection.h"
+#include "OSSupport/MakeDir.h"
#include "ToJava.h"
+#include "Root.h"
+
#include <android/log.h>
cCriticalSection g_CriticalSection;
diff --git a/Android/res/drawable-hdpi/ic_launcher.png b/Android/res/drawable-hdpi/ic_launcher.png Binary files differindex 96a442e5b..d8a74a2d8 100644 --- a/Android/res/drawable-hdpi/ic_launcher.png +++ b/Android/res/drawable-hdpi/ic_launcher.png diff --git a/Android/res/drawable-ldpi/ic_launcher.png b/Android/res/drawable-ldpi/ic_launcher.png Binary files differindex 99238729d..5fa7251f8 100644 --- a/Android/res/drawable-ldpi/ic_launcher.png +++ b/Android/res/drawable-ldpi/ic_launcher.png diff --git a/Android/res/drawable-mdpi/ic_launcher.png b/Android/res/drawable-mdpi/ic_launcher.png Binary files differindex 359047dfa..0e3af7c05 100644 --- a/Android/res/drawable-mdpi/ic_launcher.png +++ b/Android/res/drawable-mdpi/ic_launcher.png diff --git a/Android/res/drawable-xhdpi/ic_launcher.png b/Android/res/drawable-xhdpi/ic_launcher.png Binary files differindex 71c6d760f..60b19df2d 100644 --- a/Android/res/drawable-xhdpi/ic_launcher.png +++ b/Android/res/drawable-xhdpi/ic_launcher.png |
