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
@ -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 := $(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 %.cpp,../%.cpp,$(LOCAL_SRC_FILES))
|
||||||
LOCAL_SRC_FILES := $(patsubst %.c,../%.c,$(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_STATIC_LIBRARIES := cpufeatures
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := ./source \
|
LOCAL_C_INCLUDES := ../source \
|
||||||
./source/md5 \
|
../source/md5 \
|
||||||
./WebServer \
|
../WebServer \
|
||||||
./source/packets \
|
../source/packets \
|
||||||
./source/items \
|
../source/items \
|
||||||
./source/blocks \
|
../source/blocks \
|
||||||
./tolua++-1.0.93/src/lib \
|
../tolua++-1.0.93/src/lib \
|
||||||
./lua-5.1.4/src \
|
../lua-5.1.4/src \
|
||||||
./zlib-1.2.7 \
|
../zlib-1.2.7 \
|
||||||
./iniFile \
|
../iniFile \
|
||||||
./tolua++-1.0.93/include \
|
../tolua++-1.0.93/include \
|
||||||
./jsoncpp-src-0.5.0/include \
|
../jsoncpp-src-0.5.0/include \
|
||||||
./jsoncpp-src-0.5.0/src/lib_json \
|
../jsoncpp-src-0.5.0/src/lib_json \
|
||||||
./squirrel_3_0_1_stable/include \
|
../squirrel_3_0_1_stable/include \
|
||||||
./squirrel_3_0_1_stable \
|
../squirrel_3_0_1_stable \
|
||||||
./squirrel_3_0_1_stable/sqrat \
|
../squirrel_3_0_1_stable/sqrat \
|
||||||
|
|
||||||
|
|
||||||
LOCAL_LDLIBS := -ldl -llog
|
LOCAL_LDLIBS := -ldl -llog
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
@ -8,8 +8,6 @@ import java.net.NetworkInterface;
|
|||||||
import java.net.SocketException;
|
import java.net.SocketException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
import java.util.Timer;
|
|
||||||
import java.util.TimerTask;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|