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

Merge pull request #1269 from vcmi/beta

Browse Source 
Merge android fix into develop
This commit is contained in:
Nordsoft91
2022-12-24 22:07:04 +04:00
committed by GitHub
parent 5b57b69699 2953b8fe9d
commit 64fb4a744e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/CVCMIServer.cpp
View File

@@ -1118,14 +1118,11 @@ int main(int argc, char * argv[])
}
#ifdef VCMI_ANDROID
void CVCMIServer::create(const std::vector<std::string> & args)
void CVCMIServer::create()
{
const char * foo = "android-server";
std::vector<const void *> argv = {foo};
for(auto & a : args)
argv.push_back(a.c_str());
main(argv.size(), const_cast<char **>(foo));
main(argv.size(), reinterpret_cast<char **>(const_cast<void **>(&*argv.begin())));
}
#elif defined(SINGLE_PROCESS_APP)
void CVCMIServer::create(boost::condition_variable * cond, const std::vector<std::string> & args)