From 01a4ab77266016278b0c192574718b2e04406161 Mon Sep 17 00:00:00 2001 From: faketruth Date: Sun, 19 Aug 2012 16:43:47 +0000 Subject: [PATCH] Android: Moved Android stuff to the ~/trunk/Android/ folder! git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- .classpath => Android/.classpath | 0 .project => Android/.project | 0 .../.settings}/org.eclipse.jdt.core.prefs | 0 .../AndroidManifest.xml | 0 {jni => Android/jni}/Android.mk | 34 +++++++++--------- {jni => Android/jni}/Application.mk | 0 {jni => Android/jni}/ToJava.cpp | 0 {jni => Android/jni}/ToJava.h | 0 {jni => Android/jni}/app-android.cpp | 0 .../proguard-project.txt | 0 .../project.properties | 0 .../res}/drawable-hdpi/ic_launcher.png | Bin .../res}/drawable-ldpi/ic_launcher.png | Bin .../res}/drawable-mdpi/ic_launcher.png | Bin .../res}/drawable-xhdpi/ic_launcher.png | Bin {res => Android/res}/layout/main.xml | 0 {res => Android/res}/values/strings.xml | 0 .../src}/com/mcserver/MCServerActivity.java | 2 -- 18 files changed, 17 insertions(+), 19 deletions(-) rename .classpath => Android/.classpath (100%) rename .project => Android/.project (100%) rename {.settings => Android/.settings}/org.eclipse.jdt.core.prefs (100%) rename AndroidManifest.xml => Android/AndroidManifest.xml (100%) rename {jni => Android/jni}/Android.mk (51%) rename {jni => Android/jni}/Application.mk (100%) rename {jni => Android/jni}/ToJava.cpp (100%) rename {jni => Android/jni}/ToJava.h (100%) rename {jni => Android/jni}/app-android.cpp (100%) rename proguard-project.txt => Android/proguard-project.txt (100%) rename project.properties => Android/project.properties (100%) rename {res => Android/res}/drawable-hdpi/ic_launcher.png (100%) rename {res => Android/res}/drawable-ldpi/ic_launcher.png (100%) rename {res => Android/res}/drawable-mdpi/ic_launcher.png (100%) rename {res => Android/res}/drawable-xhdpi/ic_launcher.png (100%) rename {res => Android/res}/layout/main.xml (100%) rename {res => Android/res}/values/strings.xml (100%) rename {src => Android/src}/com/mcserver/MCServerActivity.java (99%) diff --git a/.classpath b/Android/.classpath similarity index 100% rename from .classpath rename to Android/.classpath diff --git a/.project b/Android/.project similarity index 100% rename from .project rename to Android/.project diff --git a/.settings/org.eclipse.jdt.core.prefs b/Android/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from .settings/org.eclipse.jdt.core.prefs rename to Android/.settings/org.eclipse.jdt.core.prefs diff --git a/AndroidManifest.xml b/Android/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to Android/AndroidManifest.xml diff --git a/jni/Android.mk b/Android/jni/Android.mk similarity index 51% rename from jni/Android.mk rename to 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 similarity index 100% rename from jni/Application.mk rename to Android/jni/Application.mk diff --git a/jni/ToJava.cpp b/Android/jni/ToJava.cpp similarity index 100% rename from jni/ToJava.cpp rename to Android/jni/ToJava.cpp diff --git a/jni/ToJava.h b/Android/jni/ToJava.h similarity index 100% rename from jni/ToJava.h rename to Android/jni/ToJava.h diff --git a/jni/app-android.cpp b/Android/jni/app-android.cpp similarity index 100% rename from jni/app-android.cpp rename to Android/jni/app-android.cpp diff --git a/proguard-project.txt b/Android/proguard-project.txt similarity index 100% rename from proguard-project.txt rename to Android/proguard-project.txt diff --git a/project.properties b/Android/project.properties similarity index 100% rename from project.properties rename to Android/project.properties diff --git a/res/drawable-hdpi/ic_launcher.png b/Android/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to Android/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-ldpi/ic_launcher.png b/Android/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from res/drawable-ldpi/ic_launcher.png rename to Android/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_launcher.png b/Android/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to Android/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/Android/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to Android/res/drawable-xhdpi/ic_launcher.png diff --git a/res/layout/main.xml b/Android/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to Android/res/layout/main.xml diff --git a/res/values/strings.xml b/Android/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to Android/res/values/strings.xml diff --git a/src/com/mcserver/MCServerActivity.java b/Android/src/com/mcserver/MCServerActivity.java similarity index 99% rename from src/com/mcserver/MCServerActivity.java rename to 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;