diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-19 18:43:47 +0200 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-19 18:43:47 +0200 |
| commit | 01a4ab77266016278b0c192574718b2e04406161 (patch) | |
| tree | 0d8c0d527b66f329eb6d446b56f81506a909d7d1 /jni | |
| parent | Android: Go away gen folder! You're nothing but trouble (for now) (diff) | |
| download | cuberite-01a4ab77266016278b0c192574718b2e04406161.tar cuberite-01a4ab77266016278b0c192574718b2e04406161.tar.gz cuberite-01a4ab77266016278b0c192574718b2e04406161.tar.bz2 cuberite-01a4ab77266016278b0c192574718b2e04406161.tar.lz cuberite-01a4ab77266016278b0c192574718b2e04406161.tar.xz cuberite-01a4ab77266016278b0c192574718b2e04406161.tar.zst cuberite-01a4ab77266016278b0c192574718b2e04406161.zip | |
Diffstat (limited to '')
| -rw-r--r-- | Android/jni/Android.mk (renamed from jni/Android.mk) | 34 | ||||
| -rw-r--r-- | Android/jni/Application.mk (renamed from jni/Application.mk) | 0 | ||||
| -rw-r--r-- | Android/jni/ToJava.cpp (renamed from jni/ToJava.cpp) | 0 | ||||
| -rw-r--r-- | Android/jni/ToJava.h (renamed from jni/ToJava.h) | 0 | ||||
| -rw-r--r-- | Android/jni/app-android.cpp (renamed from jni/app-android.cpp) | 0 |
5 files changed, 17 insertions, 17 deletions
diff --git a/jni/Android.mk b/Android/jni/Android.mk index 68c807c6e..6fd8d3a14 100644 --- a/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 ../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))
@@ -20,22 +20,22 @@ LOCAL_CFLAGS := -DANDROID_NDK \ LOCAL_STATIC_LIBRARIES := cpufeatures
-LOCAL_C_INCLUDES := ./source \
- ./source/md5 \
- ./WebServer \
- ./source/packets \
- ./source/items \
- ./source/blocks \
- ./tolua++-1.0.93/src/lib \
- ./lua-5.1.4/src \
- ./zlib-1.2.7 \
- ./iniFile \
- ./tolua++-1.0.93/include \
- ./jsoncpp-src-0.5.0/include \
- ./jsoncpp-src-0.5.0/src/lib_json \
- ./squirrel_3_0_1_stable/include \
- ./squirrel_3_0_1_stable \
- ./squirrel_3_0_1_stable/sqrat \
+LOCAL_C_INCLUDES := ../source \
+ ../source/md5 \
+ ../WebServer \
+ ../source/packets \
+ ../source/items \
+ ../source/blocks \
+ ../tolua++-1.0.93/src/lib \
+ ../lua-5.1.4/src \
+ ../zlib-1.2.7 \
+ ../iniFile \
+ ../tolua++-1.0.93/include \
+ ../jsoncpp-src-0.5.0/include \
+ ../jsoncpp-src-0.5.0/src/lib_json \
+ ../squirrel_3_0_1_stable/include \
+ ../squirrel_3_0_1_stable \
+ ../squirrel_3_0_1_stable/sqrat \
LOCAL_LDLIBS := -ldl -llog
diff --git a/jni/Application.mk b/Android/jni/Application.mk index c68dfe204..c68dfe204 100644 --- a/jni/Application.mk +++ b/Android/jni/Application.mk diff --git a/jni/ToJava.cpp b/Android/jni/ToJava.cpp index 10d4e84a0..10d4e84a0 100644 --- a/jni/ToJava.cpp +++ b/Android/jni/ToJava.cpp diff --git a/jni/ToJava.h b/Android/jni/ToJava.h index bc10f01e3..bc10f01e3 100644 --- a/jni/ToJava.h +++ b/Android/jni/ToJava.h diff --git a/jni/app-android.cpp b/Android/jni/app-android.cpp index a6fb1baf2..a6fb1baf2 100644 --- a/jni/app-android.cpp +++ b/Android/jni/app-android.cpp |