diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 8a5016db..2e92c6f9 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -80,7 +80,8 @@ const char *GAME_ARGS[] = { "--version", "--opengl-info", "--sdl-info", - "--lua-info", + "--lua-info", + "--curl-info", "--validate-techtrees", "--validate-factions", "--data-path", @@ -99,7 +100,8 @@ enum GAME_ARG_TYPE { GAME_ARG_VERSION, GAME_ARG_OPENGL_INFO, GAME_ARG_SDL_INFO, - GAME_ARG_LUA_INFO, + GAME_ARG_LUA_INFO, + GAME_ARG_CURL_INFO, GAME_ARG_VALIDATE_TECHTREES, GAME_ARG_VALIDATE_FACTIONS, GAME_ARG_DATA_PATH, @@ -600,7 +602,8 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) { printf("\n%s\t\t\tdisplays the version string of this program.",GAME_ARGS[GAME_ARG_VERSION]); printf("\n%s\t\t\tdisplays your video driver's OpenGL information.",GAME_ARGS[GAME_ARG_OPENGL_INFO]); printf("\n%s\t\t\tdisplays your SDL version information.",GAME_ARGS[GAME_ARG_SDL_INFO]); - printf("\n%s\t\t\tdisplays your LUA version information.",GAME_ARGS[GAME_ARG_LUA_INFO]); + printf("\n%s\t\t\tdisplays your LUA version information.",GAME_ARGS[GAME_ARG_LUA_INFO]); + printf("\n%s\t\t\tdisplays your CURL version information.",GAME_ARGS[GAME_ARG_CURL_INFO]); printf("\n%s=x\t\tdisplays a report detailing any known problems related",GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); printf("\n \t\tto your selected techtrees game data."); printf("\n \t\tWhere x is a comma-delimited list of techtrees to validate."); @@ -967,7 +970,8 @@ int glestMain(int argc, char** argv) { if( hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_OPENGL_INFO]) == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_SDL_INFO]) == true || - hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_LUA_INFO]) == true || + hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_LUA_INFO]) == true || + hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_CURL_INFO]) == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]) == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VALIDATE_FACTIONS]) == true) { @@ -998,7 +1002,12 @@ int glestMain(int argc, char** argv) { if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_LUA_INFO]) == true) { printf("LUA version: %s\n", LUA_RELEASE); - } + } + + if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_CURL_INFO]) == true) { + curl_version_info_data *curlVersion= curl_version_info(CURLVERSION_NOW); + printf("CURL version: %s\n", curlVersion->version); + } if( (hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_SDL_INFO]) == true ||