Merge pull request #4804 from FearlessTobi/port-2404

Port yuzu-emu/yuzu#2404: "CMakeLists: Ensure we specify Unicode as the codepage on Windows"
This commit is contained in:
Weiyi Wang
2019-07-13 22:28:12 -04:00
committed by GitHub
3 changed files with 15 additions and 12 deletions

View File

@@ -11,11 +11,6 @@
// This needs to be included before getopt.h because the latter #defines symbols used by it
#include "common/microprofile.h"
#include <getopt.h>
#ifndef _MSC_VER
#include <unistd.h>
#endif
#ifdef _WIN32
// windows.h needs to be included before shellapi.h
#include <windows.h>
@@ -45,6 +40,12 @@
#include "core/settings.h"
#include "network/network.h"
#undef _UNICODE
#include <getopt.h>
#ifndef _MSC_VER
#include <unistd.h>
#endif
#ifdef _WIN32
extern "C" {
// tells Nvidia drivers to use the dedicated GPU by default on laptops with switchable graphics