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

- bug fixes and patches from hasufell related to:

Browse Source 
- fontconfig not working
- new cmake option to control inclusion of libvlc
- new commandline option to force where to look for fonts: --font-path=x
- removal of libluajit from cmake
This commit is contained in:
Mark Vejvoda
2012-11-14 19:20:08 +00:00
parent 53f1163ca4
commit d322f73284
7 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1151,6 +1151,29 @@ int setupGameItemPaths(int argc, char** argv, Config *config) {
}
Text::DEFAULT_FONT_PATH = pathCache[GameConstants::path_data_CacheLookupKey];
if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_FONT_PATH]) == true) {
int foundParamIndIndex = -1;
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_FONT_PATH]) + string("="),&foundParamIndIndex);
if(foundParamIndIndex < 0) {
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_FONT_PATH]),&foundParamIndIndex);
}
string customPath = argv[foundParamIndIndex];
vector<string> paramPartTokens;
Tokenize(customPath,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
string customPathValue = paramPartTokens[1];
Properties::applyTagsToValue(customPathValue);
Text::DEFAULT_FONT_PATH_ABSOLUTE = customPathValue;
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Using custom fonts path [%s]\n",customPathValue.c_str());
}
else {
printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
printParameterHelp(argv[0],false);
return 1;
}
}
return 0;
}