X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fmain.cpp;h=3593c691c82b7588f501a6f3e63235fea9784746;hb=77f22d0571ddca7bbfd1d1f621d61785d375c889;hp=3e37f646a81462aa9666054f6c6e2cfadf2b18ea;hpb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;p=lugaru.git
diff --git a/Source/main.cpp b/Source/main.cpp
index 3e37f64..3593c69 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -1,6 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -22,8 +22,9 @@ along with Lugaru. If not, see .
#include "Audio/openal_wrapper.hpp"
#include "Graphic/gamegl.hpp"
-#include "MacCompatibility.hpp"
+#include "Platform/Platform.hpp"
#include "User/Settings.hpp"
+#include "Version.hpp"
#include
#include
@@ -36,7 +37,6 @@ along with Lugaru. If not, see .
using namespace Game;
#ifdef WIN32
-#include "win-res/resource.hpp"
#include
#include
#endif
@@ -588,6 +588,7 @@ const option::Descriptor usage[] =
{
{ UNKNOWN, 0, "", "", option::Arg::None, "USAGE: lugaru [options]\n\n"
"Options:" },
+ { VERSION, 0, "v", "version", option::Arg::None, " -v, --version Print version and exit." },
{ HELP, 0, "h", "help", option::Arg::None, " -h, --help Print usage and exit." },
{ FULLSCREEN, 1, "f", "fullscreen", option::Arg::None, " -f, --fullscreen Start the game in fullscreen mode." },
{ FULLSCREEN, 0, "w", "windowed", option::Arg::None, " -w, --windowed Start the game in windowed mode (default)." },
@@ -620,6 +621,23 @@ int main(int argc, char** argv)
return 1;
}
+ // Always start by printing the version and info to the stdout
+ std::cout << "--------------------------------------------------------------------------\n"
+ << "Lugaru HD: The Rabbit's Foot, by Wolfire Games and the OSS Lugaru project.\n\n"
+ << "Licensed under the GPL 2.0+ and CC-BY-SA 3.0 and 4.0 licenses.\n"
+ << "More information, updates and bug reports at http://osslugaru.gitlab.io\n"
+ << std::endl;
+
+ std::cout << "Version " + VERSION_STRING + " -- " + VERSION_BUILD_TYPE + " build\n"
+ << "--------------------------------------------------------------------------\n"
+ << std::endl;
+
+ if (commandLineOptions[VERSION]) {
+ // That was enough, quit.
+ delete[] commandLineOptionsBuffer;
+ return 0;
+ }
+
if (commandLineOptions[HELP]) {
option::printUsage(std::cout, usage);
delete[] commandLineOptionsBuffer;