summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-05-24 15:01:07 +0200
committerGitHub <noreply@github.com>2018-05-24 15:01:07 +0200
commit55e6296e71c201018940b0d5e82fa15946753344 (patch)
tree7a9f62a29478bf9c6ead212564f256ff15aa5bee
parentMerge pull request #462 from ogniK5377/hid-fix (diff)
parentyuzu_cmd: Fix project for latest msvc. (diff)
downloadyuzu-55e6296e71c201018940b0d5e82fa15946753344.tar
yuzu-55e6296e71c201018940b0d5e82fa15946753344.tar.gz
yuzu-55e6296e71c201018940b0d5e82fa15946753344.tar.bz2
yuzu-55e6296e71c201018940b0d5e82fa15946753344.tar.lz
yuzu-55e6296e71c201018940b0d5e82fa15946753344.tar.xz
yuzu-55e6296e71c201018940b0d5e82fa15946753344.tar.zst
yuzu-55e6296e71c201018940b0d5e82fa15946753344.zip
-rw-r--r--src/yuzu_cmd/yuzu.cpp26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index f99413966..95e568b7b 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -7,8 +7,19 @@
#include <string>
#include <thread>
-// This needs to be included before getopt.h because the latter #defines symbols used by it
+#include "common/logging/backend.h"
+#include "common/logging/filter.h"
+#include "common/logging/log.h"
#include "common/microprofile.h"
+#include "common/scm_rev.h"
+#include "common/scope_exit.h"
+#include "common/string_util.h"
+#include "core/core.h"
+#include "core/gdbstub/gdbstub.h"
+#include "core/loader/loader.h"
+#include "core/settings.h"
+#include "yuzu_cmd/config.h"
+#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
#ifdef _MSC_VER
#include <getopt.h>
@@ -24,19 +35,6 @@
#include <shellapi.h>
#endif
-#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/core.h"
-#include "core/gdbstub/gdbstub.h"
-#include "core/loader/loader.h"
-#include "core/settings.h"
-#include "yuzu_cmd/config.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
-
#ifdef _WIN32
extern "C" {
// tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable