diff options
| author | bunnei <bunneidev@gmail.com> | 2018-05-24 03:51:49 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-05-24 03:51:49 +0200 |
| commit | 1ce7942dc2dfdb2e7164fe57d757facf29a19073 (patch) | |
| tree | 7a9f62a29478bf9c6ead212564f256ff15aa5bee | |
| parent | Merge pull request #462 from ogniK5377/hid-fix (diff) | |
| download | yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.gz yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.bz2 yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.lz yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.xz yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.zst yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.zip | |
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 26 |
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 |