summaryrefslogtreecommitdiffstats
path: root/Android/jni
diff options
context:
space:
mode:
Diffstat (limited to 'Android/jni')
-rw-r--r--Android/jni/Android.mk5
-rw-r--r--Android/jni/Application.mk5
-rw-r--r--Android/jni/app-android.cpp7
3 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;