Merge pull request #9041 from shuffle2/no-pch

windows: fix build if pch were to be disabled
2020-08-22 19:42:44 -04:00 · 2020-08-22 19:42:44 -04:00 · a9c8f5424b
parent 800b2480ec cff4806d8d
commit a9c8f5424b
4 changed files with 4 additions and 3 deletions
--- a/Source/Core/Common/GL/GLContext.cpp
+++ b/Source/Core/Common/GL/GLContext.cpp
@ -9,7 +9,7 @@
 #if defined(__APPLE__)
 #include "Common/GL/GLInterface/AGL.h"
 #endif
-#if defined(WIN32)
+#if defined(_WIN32)
 #include "Common/GL/GLInterface/WGL.h"
 #endif
 #if HAVE_X11
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@ -26,7 +26,7 @@
 #include "QtUtils/SignalDaemon.h"
 #endif

-#ifndef WIN32
+#ifndef _WIN32
 #include <qpa/qplatformnativeinterface.h>
 #endif

--- a/Source/Core/DolphinQt/MainWindow.h
+++ b/Source/Core/DolphinQt/MainWindow.h
@ -7,6 +7,7 @@
 #include <QMainWindow>
 #include <QStringList>

+#include <array>
 #include <memory>
 #include <optional>
 #include <string>
--- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.h
+++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.h
@ -6,7 +6,7 @@

 #define VK_NO_PROTOTYPES

-#if defined(WIN32)
+#if defined(_WIN32)
 #define VK_USE_PLATFORM_WIN32_KHR
 #endif