summaryrefslogtreecommitdiffstats
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-18 02:38:01 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-18 02:38:01 +0200
commitdc8479928c5aee4c6ad6fe4f59006fb604cee701 (patch)
tree569a7f13128450bbab973236615587ff00bced5f /src/citra/citra.cpp
parentTravis: Import Dolphin’s clang-format hook. (diff)
downloadyuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.gz
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.bz2
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.lz
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.xz
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.zst
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.zip
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp39
1 files changed, 18 insertions, 21 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 128b9a16d..7b387e258 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include <string>
-#include <thread>
#include <iostream>
#include <memory>
+#include <string>
+#include <thread>
// This needs to be included before getopt.h because the latter #defines symbols used by it
#include "common/microprofile.h"
@@ -13,53 +13,51 @@
#ifdef _MSC_VER
#include <getopt.h>
#else
-#include <unistd.h>
#include <getopt.h>
+#include <unistd.h>
#endif
#ifdef _WIN32
#include <Windows.h>
#endif
-#include "common/logging/log.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
+#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/scope_exit.h"
#include "common/string_util.h"
-#include "core/settings.h"
-#include "core/system.h"
#include "core/core.h"
#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
+#include "core/settings.h"
+#include "core/system.h"
#include "citra/config.h"
#include "citra/emu_window/emu_window_sdl2.h"
#include "video_core/video_core.h"
-
-static void PrintHelp(const char *argv0)
-{
- std::cout << "Usage: " << argv0 << " [options] <filename>\n"
+static void PrintHelp(const char* argv0) {
+ 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()
-{
+static void PrintVersion() {
std::cout << "Citra " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
}
/// Application entry point
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
Config config;
int option_index = 0;
bool use_gdbstub = Settings::values.use_gdbstub;
u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port);
- char *endarg;
+ char* endarg;
#ifdef _WIN32
int argc_w;
auto argv_w = CommandLineToArgvW(GetCommandLineW(), &argc_w);
@@ -71,12 +69,10 @@ int main(int argc, char **argv) {
#endif
std::string boot_filename;
- static struct option long_options[] = {
- { "gdbport", required_argument, 0, 'g' },
- { "help", no_argument, 0, 'h' },
- { "version", no_argument, 0, 'v' },
- { 0, 0, 0, 0 }
- };
+ static struct option long_options[] = {{"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, "g:hv", long_options, &option_index);
@@ -86,7 +82,8 @@ int main(int argc, char **argv) {
errno = 0;
gdb_port = strtoul(optarg, &endarg, 0);
use_gdbstub = true;
- if (endarg == optarg) errno = EINVAL;
+ if (endarg == optarg)
+ errno = EINVAL;
if (errno != 0) {
perror("--gdbport");
exit(1);