From e9fdef9bd31320f4a9ca475a5c44c00dde8726ae Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Mon, 20 Oct 2014 20:15:00 -0400 Subject: [PATCH] fixup version reports - Pango and Cairo now describe both their compile time and runtime versions - Boost now states that it is the compile time version, afaik wesnoth cannot determine what boost versions it is linked against. --- src/font.cpp | 11 ++++++++++- src/wesnoth.cpp | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/font.cpp b/src/font.cpp index 36a5066b00a..c793bc5d792 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -322,7 +323,15 @@ namespace font { std::string describe_versions() { - return std::string("Cairo version: ") + cairo_version_string() + "\nPango version: " + pango_version_string() + "\n"; + std::stringstream ss; + + ss << "Compiled with Cairo version: " << CAIRO_VERSION_STRING << std::endl; + ss << "Running with Cairo version: " << cairo_version_string() << std::endl; + + ss << "Compiled with Pango version: " << PANGO_VERSION_STRING << std::endl; + ss << "Running with Pango version: " << pango_version_string() << std::endl; + + return ss.str(); } manager::manager() diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp index 4565be72447..bade2e7cbaa 100644 --- a/src/wesnoth.cpp +++ b/src/wesnoth.cpp @@ -444,7 +444,7 @@ static int process_command_args(const commandline_options& cmdline_opts) { } if(cmdline_opts.version) { std::cout << "Battle for Wesnoth" << " " << game_config::version << "\n\n"; - std::cout << "Boost version: " << BOOST_LIB_VERSION << "\n"; + std::cout << "Compiled with Boost version: " << BOOST_LIB_VERSION << "\n"; std::cout << font::describe_versions(); std::cout << describe_SDL_versions(); std::cout << sound::describe_versions();