Browse Source
Merge pull request #2404 from lioncash/unicode
CMakeLists: Ensure we specify Unicode as the codepage on Windows
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
4 deletions
-
src/CMakeLists.txt
-
src/yuzu_cmd/yuzu.cpp
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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
|
|
|
|
|
