diff options
| author | bunnei <bunneidev@gmail.com> | 2019-04-25 04:51:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 04:51:17 +0200 |
| commit | 05928690761f25b3540046e942afcec268b3fbbb (patch) | |
| tree | 2555c88bfede62cd14ee44c474ac7e778fcf1cb2 | |
| parent | Merge pull request #2422 from ReinUsesLisp/fixup-samplers (diff) | |
| parent | CMakeLists: Ensure we specify Unicode as the codepage on Windows (diff) | |
| download | yuzu-05928690761f25b3540046e942afcec268b3fbbb.tar yuzu-05928690761f25b3540046e942afcec268b3fbbb.tar.gz yuzu-05928690761f25b3540046e942afcec268b3fbbb.tar.bz2 yuzu-05928690761f25b3540046e942afcec268b3fbbb.tar.lz yuzu-05928690761f25b3540046e942afcec268b3fbbb.tar.xz yuzu-05928690761f25b3540046e942afcec268b3fbbb.tar.zst yuzu-05928690761f25b3540046e942afcec268b3fbbb.zip | |
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c99dd5e2..9aea4af87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,9 @@ if (MSVC) # Avoid windows.h from including some usually unused libs like winsocks.h, since this might cause some redefinition errors. add_definitions(-DWIN32_LEAN_AND_MEAN) + # Ensure that projects build with Unicode support. + add_definitions(-DUNICODE -D_UNICODE) + # /W3 - Level 3 warnings # /MP - Multi-threaded compilation # /Zi - Output debugging information 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 |