sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIN32 macro -> _WIN32

Browse Source
This commit is contained in:
Connor McLaughlin
2021-06-28 20:16:48 +10:00
parent 489de3f9ce
commit 911e9a37f1
41 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/duckstation-qt/qthostinterface.cpp
View File

@ -39,7 +39,7 @@
#include <memory>
Log_SetChannel(QtHostInterface);
#ifdef WIN32
#ifdef _WIN32
#include "common/windows_headers.h"
#include "frontend-common/d3d11_host_display.h"
#include <KnownFolders.h>
@ -570,13 +570,13 @@ HostDisplay* QtHostInterface::createHostDisplay()
break;
case GPURenderer::HardwareOpenGL:
#ifndef WIN32
#ifndef _WIN32
default:
#endif
m_display = std::make_unique<FrontendCommon::OpenGLHostDisplay>();
break;
#ifdef WIN32
#ifdef _WIN32
case GPURenderer::HardwareD3D11:
default:
m_display = std::make_unique<FrontendCommon::D3D11HostDisplay>();
@ -1616,7 +1616,7 @@ void QtHostInterface::wakeThread()
static std::string GetFontPath(const char* name)
{
#ifdef WIN32
#ifdef _WIN32
PWSTR folder_path;
if (FAILED(SHGetKnownFolderPath(FOLDERID_Fonts, 0, nullptr, &folder_path)))
return StringUtil::StdStringFromFormat("C:\\Windows\\Fonts\\%s", name);
@ -1637,7 +1637,7 @@ void QtHostInterface::setImGuiFont()
std::string path;
const ImWchar* range = nullptr;
#ifdef WIN32
#ifdef _WIN32
if (language == "ja")
{
path = GetFontPath("msgothic.ttc");