summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-05-23 21:51:49 -0400
committerGravatar bunnei2018-05-23 21:51:49 -0400
commit1ce7942dc2dfdb2e7164fe57d757facf29a19073 (patch)
tree7a9f62a29478bf9c6ead212564f256ff15aa5bee /src
parentMerge pull request #462 from ogniK5377/hid-fix (diff)
downloadyuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.gz
yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.tar.xz
yuzu-1ce7942dc2dfdb2e7164fe57d757facf29a19073.zip
yuzu_cmd: Fix project for latest msvc.
Diffstat (limited to 'src')
-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 @@
7#include <string> 7#include <string>
8#include <thread> 8#include <thread>
9 9
10// This needs to be included before getopt.h because the latter #defines symbols used by it 10#include "common/logging/backend.h"
11#include "common/logging/filter.h"
12#include "common/logging/log.h"
11#include "common/microprofile.h" 13#include "common/microprofile.h"
14#include "common/scm_rev.h"
15#include "common/scope_exit.h"
16#include "common/string_util.h"
17#include "core/core.h"
18#include "core/gdbstub/gdbstub.h"
19#include "core/loader/loader.h"
20#include "core/settings.h"
21#include "yuzu_cmd/config.h"
22#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
12 23
13#ifdef _MSC_VER 24#ifdef _MSC_VER
14#include <getopt.h> 25#include <getopt.h>
@@ -24,19 +35,6 @@
24#include <shellapi.h> 35#include <shellapi.h>
25#endif 36#endif
26 37
27#include "common/logging/backend.h"
28#include "common/logging/filter.h"
29#include "common/logging/log.h"
30#include "common/scm_rev.h"
31#include "common/scope_exit.h"
32#include "common/string_util.h"
33#include "core/core.h"
34#include "core/gdbstub/gdbstub.h"
35#include "core/loader/loader.h"
36#include "core/settings.h"
37#include "yuzu_cmd/config.h"
38#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
39
40#ifdef _WIN32 38#ifdef _WIN32
41extern "C" { 39extern "C" {
42// tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable 40// tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable