From 146f77fdb750833c649de7159a0833c398e14a4d Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 10 Feb 2015 21:14:24 +0100 Subject: 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 --- build/android/jni/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build/android/jni') 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 += \ -- cgit v1.2.3