summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-02-10 21:14:24 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-02-12 15:00:03 +0100
commit146f77fdb750833c649de7159a0833c398e14a4d (patch)
tree05314d9cae6215ecd418e98fa4fe8e31b2632f0c /build
parent92d1985802b9b5c8a8ca3540221b078fcaadb697 (diff)
downloadminetest-146f77fdb750833c649de7159a0833c398e14a4d.tar.gz
minetest-146f77fdb750833c649de7159a0833c398e14a4d.tar.bz2
minetest-146f77fdb750833c649de7159a0833c398e14a4d.zip
main.cpp rework * Move ClientLauncher class to a dedicated file * ClientLauncher now owns print_video_modes and speed_tests functions (they are only called by him) * Move GameParams to shared/gameparams.h because it's shared between server and client and launcher need to know it * Move InputHandlers class to client/inputhandler.h * Cleanup includes
Diffstat (limited to 'build')
-rw-r--r--build/android/jni/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 4ac2239c9..ed72c30ae 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -214,7 +214,8 @@ LOCAL_SRC_FILES := \
jni/src/touchscreengui.cpp \
jni/src/database-leveldb.cpp \
jni/src/settings.cpp \
- jni/src/wieldmesh.cpp
+ jni/src/wieldmesh.cpp \
+ jni/src/client/clientlauncher.cpp
# Network
LOCAL_SRC_FILES += \