diff options
Diffstat (limited to '')
| -rw-r--r-- | Android/.classpath (renamed from .classpath) | 0 | ||||
| -rw-r--r-- | Android/.project (renamed from .project) | 0 | ||||
| -rw-r--r-- | Android/.settings/org.eclipse.jdt.core.prefs (renamed from .settings/org.eclipse.jdt.core.prefs) | 0 | ||||
| -rw-r--r-- | Android/AndroidManifest.xml (renamed from AndroidManifest.xml) | 0 | ||||
| -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 | ||||
| -rw-r--r-- | Android/proguard-project.txt (renamed from proguard-project.txt) | 0 | ||||
| -rw-r--r-- | Android/project.properties (renamed from project.properties) | 0 | ||||
| -rw-r--r-- | Android/res/drawable-hdpi/ic_launcher.png (renamed from res/drawable-hdpi/ic_launcher.png) | bin | 9397 -> 9397 bytes | |||
| -rw-r--r-- | Android/res/drawable-ldpi/ic_launcher.png (renamed from res/drawable-ldpi/ic_launcher.png) | bin | 2729 -> 2729 bytes | |||
| -rw-r--r-- | Android/res/drawable-mdpi/ic_launcher.png (renamed from res/drawable-mdpi/ic_launcher.png) | bin | 5237 -> 5237 bytes | |||
| -rw-r--r-- | Android/res/drawable-xhdpi/ic_launcher.png (renamed from res/drawable-xhdpi/ic_launcher.png) | bin | 14383 -> 14383 bytes | |||
| -rw-r--r-- | Android/res/layout/main.xml (renamed from res/layout/main.xml) | 0 | ||||
| -rw-r--r-- | Android/res/values/strings.xml (renamed from res/values/strings.xml) | 0 | ||||
| -rw-r--r-- | Android/src/com/mcserver/MCServerActivity.java (renamed from src/com/mcserver/MCServerActivity.java) | 2 |
18 files changed, 17 insertions, 19 deletions
diff --git a/.classpath b/Android/.classpath index a4f1e4054..a4f1e4054 100644 --- a/.classpath +++ b/Android/.classpath diff --git a/.project b/Android/.project index 34dd17184..34dd17184 100644 --- a/.project +++ b/Android/.project diff --git a/.settings/org.eclipse.jdt.core.prefs b/Android/.settings/org.eclipse.jdt.core.prefs index da5d06089..da5d06089 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/Android/.settings/org.eclipse.jdt.core.prefs diff --git a/AndroidManifest.xml b/Android/AndroidManifest.xml index d59d6e054..d59d6e054 100644 --- a/AndroidManifest.xml +++ b/Android/AndroidManifest.xml 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 diff --git a/proguard-project.txt b/Android/proguard-project.txt index f2fe1559a..f2fe1559a 100644 --- a/proguard-project.txt +++ b/Android/proguard-project.txt diff --git a/project.properties b/Android/project.properties index 7a6518b77..7a6518b77 100644 --- a/project.properties +++ b/Android/project.properties diff --git a/res/drawable-hdpi/ic_launcher.png b/Android/res/drawable-hdpi/ic_launcher.png Binary files differindex 96a442e5b..96a442e5b 100644 --- a/res/drawable-hdpi/ic_launcher.png +++ b/Android/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-ldpi/ic_launcher.png b/Android/res/drawable-ldpi/ic_launcher.png Binary files differindex 99238729d..99238729d 100644 --- a/res/drawable-ldpi/ic_launcher.png +++ b/Android/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_launcher.png b/Android/res/drawable-mdpi/ic_launcher.png Binary files differindex 359047dfa..359047dfa 100644 --- a/res/drawable-mdpi/ic_launcher.png +++ b/Android/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/Android/res/drawable-xhdpi/ic_launcher.png Binary files differindex 71c6d760f..71c6d760f 100644 --- a/res/drawable-xhdpi/ic_launcher.png +++ b/Android/res/drawable-xhdpi/ic_launcher.png diff --git a/res/layout/main.xml b/Android/res/layout/main.xml index dd5ee0e8f..dd5ee0e8f 100644 --- a/res/layout/main.xml +++ b/Android/res/layout/main.xml diff --git a/res/values/strings.xml b/Android/res/values/strings.xml index 9fce753a4..9fce753a4 100644 --- a/res/values/strings.xml +++ b/Android/res/values/strings.xml diff --git a/src/com/mcserver/MCServerActivity.java b/Android/src/com/mcserver/MCServerActivity.java index 2bdea0524..0a686c882 100644 --- a/src/com/mcserver/MCServerActivity.java +++ b/Android/src/com/mcserver/MCServerActivity.java @@ -8,8 +8,6 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.util.ArrayList; import java.util.Enumeration; -import java.util.Timer; -import java.util.TimerTask; import android.app.Activity; import android.graphics.Color; |
