1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Android port.

Conflicts:
	lib/vcmi_endian.h
This commit is contained in:
Ilya Zhuravlev
2014-02-20 22:53:18 +04:00
committed by Ilya Zhuravlev
parent ccc5c69fa2
commit db7cd79cf7
11 changed files with 128 additions and 16 deletions

View File

@@ -284,6 +284,10 @@ int main(int argc, char** argv)
logGlobal->infoStream() << "Creating console and configuring logger: " << pomtime.getDiff();
logGlobal->infoStream() << "The log file will be saved to " << logPath;
#ifdef __ANDROID__
// boost will crash without this
setenv("LANG", "C", 1);
#endif
// Init filesystem and settings
preinitDLL(::console);
settings.init();
@@ -361,8 +365,13 @@ int main(int argc, char** argv)
#ifndef __ANDROID__
//we can properly play intro only in the main thread, so we have to move loading to the separate thread
boost::thread loading(init);
#else
// on Android threaded init is broken
init();
#endif
if(!gNoGUI )
{
@@ -372,7 +381,9 @@ int main(int argc, char** argv)
}
CSDL_Ext::update(screen);
#ifndef __ANDROID__
loading.join();
#endif
logGlobal->infoStream()<<"Initialization of VCMI (together): "<<total.getDiff();
if(!vm.count("battle"))