summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-04-19 03:24:21 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-04-20 02:35:27 +0200
commit164c15f9116dd0f0b1f0a64fd551d10f24024e96 (patch)
treefa4639a97ef4447b5a6f41272a2f9888b302e07c
parentMerge pull request #1672 from wwylele/win-driver-fix (diff)
downloadyuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.tar
yuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.tar.gz
yuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.tar.bz2
yuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.tar.lz
yuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.tar.xz
yuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.tar.zst
yuzu-164c15f9116dd0f0b1f0a64fd551d10f24024e96.zip
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp29
1 files changed, 20 insertions, 9 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index d6ad13f69..b4501eb2e 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -20,6 +20,7 @@
#include "common/logging/log.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
+#include "common/scm_rev.h"
#include "common/scope_exit.h"
#include "core/settings.h"
@@ -34,11 +35,17 @@
#include "video_core/video_core.h"
-static void PrintHelp()
+static void PrintHelp(const char *argv0)
{
- std::cout << "Usage: citra [options] <filename>" << std::endl;
- std::cout << "--help, -h Display this information" << std::endl;
- std::cout << "--gdbport, -g number Enable gdb stub on port number" << std::endl;
+ std::cout << "Usage: " << argv0 << " [options] <filename>\n"
+ "-g, --gdbport=NUMBER Enable gdb stub on port NUMBER\n"
+ "-h, --help Display this help and exit\n"
+ "-v, --version Output version information and exit\n";
+}
+
+static void PrintVersion()
+{
+ std::cout << "Citra " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
}
/// Application entry point
@@ -51,18 +58,16 @@ int main(int argc, char **argv) {
std::string boot_filename;
static struct option long_options[] = {
- { "help", no_argument, 0, 'h' },
{ "gdbport", required_argument, 0, 'g' },
+ { "help", no_argument, 0, 'h' },
+ { "version", no_argument, 0, 'v' },
{ 0, 0, 0, 0 }
};
while (optind < argc) {
- char arg = getopt_long(argc, argv, ":hg:", long_options, &option_index);
+ char arg = getopt_long(argc, argv, "g:hv", long_options, &option_index);
if (arg != -1) {
switch (arg) {
- case 'h':
- PrintHelp();
- return 0;
case 'g':
errno = 0;
gdb_port = strtoul(optarg, &endarg, 0);
@@ -73,6 +78,12 @@ int main(int argc, char **argv) {
exit(1);
}
break;
+ case 'h':
+ PrintHelp(argv[0]);
+ return 0;
+ case 'v':
+ PrintVersion();
+ return 0;
}
} else {
boot_filename = argv[optind];