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
index 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
index 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
index 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
index 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;