diff options
author | bunnei <bunneidev@gmail.com> | 2019-04-24 22:51:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-24 22:51:17 -0400 |
commit | 05928690761f25b3540046e942afcec268b3fbbb (patch) | |
tree | 2555c88bfede62cd14ee44c474ac7e778fcf1cb2 /src/yuzu_cmd/yuzu.cpp | |
parent | 8df9449bb8c34737ffa4b759104562fb0905f1a7 (diff) | |
parent | 819c21d99e39dd90cefd84a2c4d8884982456d44 (diff) |
Merge pull request #2404 from lioncash/unicode
CMakeLists: Ensure we specify Unicode as the codepage on Windows
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 7ea4a1b18..a1d7879b1 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -32,11 +32,7 @@ #include "yuzu_cmd/config.h" #include "yuzu_cmd/emu_window/emu_window_sdl2.h" -#include <getopt.h> #include "core/file_sys/registered_cache.h" -#ifndef _MSC_VER -#include <unistd.h> -#endif #ifdef _WIN32 // windows.h needs to be included before shellapi.h @@ -45,6 +41,12 @@ #include <shellapi.h> #endif +#undef _UNICODE +#include <getopt.h> +#ifndef _MSC_VER +#include <unistd.h> +#endif + #ifdef _WIN32 extern "C" { // tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable |