WIN32 macro -> _WIN32

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

View File

@ -5,7 +5,7 @@
#if defined(CPU_X64)
// We need to include windows.h before xbyak does..
#ifdef WIN32
#ifdef _WIN32
#include "common/windows_headers.h"
#endif
@ -81,7 +81,7 @@ constexpr u32 MAX_FAR_HOST_BYTES_PER_INSTRUCTION = 128;
constexpr u32 CODE_STORAGE_ALIGNMENT = 4096;
// ABI selection
#if defined(WIN32)
#if defined(_WIN32)
#define ABI_WIN64 1
#elif defined(__linux__) || defined(__ANDROID__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__FreeBSD__)
#define ABI_SYSV 1

View File

@ -650,12 +650,12 @@ const char* Settings::GetCPUFastmemModeDisplayName(CPUFastmemMode mode)
}
static constexpr auto s_gpu_renderer_names = make_array(
#ifdef WIN32
#ifdef _WIN32
"D3D11",
#endif
"Vulkan", "OpenGL", "Software");
static constexpr auto s_gpu_renderer_display_names = make_array(
#ifdef WIN32
#ifdef _WIN32
TRANSLATABLE("GPURenderer", "Hardware (D3D11)"),
#endif
TRANSLATABLE("GPURenderer", "Hardware (Vulkan)"), TRANSLATABLE("GPURenderer", "Hardware (OpenGL)"),

View File

@ -1008,7 +1008,7 @@ bool CreateGPU(GPURenderer renderer)
g_gpu = GPU::CreateHardwareVulkanRenderer();
break;
#ifdef WIN32
#ifdef _WIN32
case GPURenderer::HardwareD3D11:
g_gpu = GPU::CreateHardwareD3D11Renderer();
break;

View File

@ -183,7 +183,7 @@ bool TextureReplacements::ParseReplacementFilename(const std::string& filename,
{
const char* extension = std::strrchr(filename.c_str(), '.');
const char* title = std::strrchr(filename.c_str(), '/');
#ifdef WIN32
#ifdef _WIN32
const char* title2 = std::strrchr(filename.c_str(), '\\');
if (title2 && (!title || title2 > title))
title = title2;

View File

@ -54,7 +54,7 @@ enum class PGXPMode : u8
enum class GPURenderer : u8
{
#ifdef WIN32
#ifdef _WIN32
HardwareD3D11,
#endif
HardwareVulkan,