games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Andorid: remove server main

Browse Source
This commit is contained in:
Andrii Danylchenko
2023-01-28 12:08:37 +02:00
parent 71b1d77613
commit 8855829527
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/CVCMIServer.cpp
View File

@@ -1051,8 +1051,16 @@ static void handleCommandOptions(int argc, char * argv[], boost::program_options
#ifdef SINGLE_PROCESS_APP #ifdef SINGLE_PROCESS_APP
#define main server_main #define main server_main
#endif #endif
#ifdef VCMI_ANDROID
void CVCMIServer::create()
{
const int argc = 1;
char * argv[argc] = { "android-server" };
#else
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
#endif
#if !defined(VCMI_ANDROID) && !defined(SINGLE_PROCESS_APP) #if !defined(VCMI_ANDROID) && !defined(SINGLE_PROCESS_APP)
// Correct working dir executable folder (not bundle folder) so we can use executable relative paths // Correct working dir executable folder (not bundle folder) so we can use executable relative paths
boost::filesystem::current_path(boost::filesystem::system_complete(argv[0]).parent_path()); boost::filesystem::current_path(boost::filesystem::system_complete(argv[0]).parent_path());
@@ -1120,7 +1128,10 @@ int main(int argc, char * argv[])
#endif #endif
logConfig.deconfigure(); logConfig.deconfigure();
vstd::clear_pointer(VLC); vstd::clear_pointer(VLC);
#ifndef VCMI_ANDROID
return 0; return 0;
#endif
} }
#ifdef VCMI_ANDROID #ifdef VCMI_ANDROID
@@ -1129,14 +1140,8 @@ extern "C" JNIEXPORT void JNICALL Java_eu_vcmi_vcmi_NativeMethods_createServer(J
{ {
__android_log_write(ANDROID_LOG_INFO, "VCMI", "Got jni call to init server"); __android_log_write(ANDROID_LOG_INFO, "VCMI", "Got jni call to init server");
CAndroidVMHelper::cacheVM(env); CAndroidVMHelper::cacheVM(env);
CVCMIServer::create();
}
void CVCMIServer::create() CVCMIServer::create();
{
const char * foo = "android-server";
std::vector<const void *> argv = {foo};
main(argv.size(), reinterpret_cast<char **>(const_cast<void **>(&*argv.begin())));
} }
#elif defined(SINGLE_PROCESS_APP) #elif defined(SINGLE_PROCESS_APP)