mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-03 10:51:55 +02:00
Code Issues Projects Releases Wiki Activity

- some intial changes to support cross-compilation under mingw

Browse Source
This commit is contained in:
Mark Vejvoda
2010-12-04 23:19:43 +00:00
parent 04aee1098d
commit 15aab7a581
7 changed files with 206 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/glest_game/main/main.cpp
View File

@@ -780,6 +780,8 @@ int glestMain(int argc, char** argv) {
std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys),
std::pair<string,string>("glestkeys.ini","glestuserkeys.ini"),
std::pair<bool,bool>(true,false));
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(config.getBool("No2DMouseRendering","false") == false) {
showCursor(false);
@@ -794,12 +796,18 @@ int glestMain(int argc, char** argv) {
if(config.getBool("noTeamColors","false") == true) {
MeshCallbackTeamColor::noTeamColors = true;
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
// Over-ride default network command framecount
//GameConstants::networkFramePeriod = config.getInt("NetworkFramePeriod",intToStr(GameConstants::networkFramePeriod).c_str());
//float pingTime = Socket::getAveragePingMS("soft-haus.com");
//printf("Ping time = %f\n",pingTime);
Lang &lang= Lang::getInstance();
lang.loadStrings(config.getString("Lang"));
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
program= new Program();
@@ -1125,7 +1133,22 @@ __try {
} __except(stackdumper(0, GetExceptionInformation()), EXCEPTION_CONTINUE_SEARCH) { return 0; }
#endif
}
}}//end namespace
MAIN_FUNCTION(Glest::Game::glestMainWrapper)
MAIN_FUNCTION(Glest::Game::glestMainWrapper)
/*
int main(int argc, char *argv[])
{
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 1;
}
atexit(SDL_Quit);
SDL_EnableUNICODE(1);
int result = Glest::Game::glestMainWrapper(argc, argv);
return result;
}
*/