diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-04 12:08:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 12:08:05 +0100 |
| commit | 00db622d5048eaffe1cc5af85f5ac821f44bcbb5 (patch) | |
| tree | ec1e2943e8a427156e9f155e96eb44dd898fa4dd /Source/Core | |
| parent | 79ee6aae0a6a7add698bb7fbc0ef25aa166ccdec (diff) | |
| parent | 2cb3f663bcbfd2f446df10c1555b5d5ddd0e96c1 (diff) | |
Merge pull request #9560 from JosJuice/cmake-msvc-wil
CMake: Include WIL headers
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/GameList/GameList.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index e1a19f1f0b..ae8b3d5449 100644 --- a/Source/Core/DolphinQt/GameList/GameList.cpp +++ b/Source/Core/DolphinQt/GameList/GameList.cpp @@ -2,6 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#ifdef _WIN32 +#include <QCoreApplication> +#include <shlobj.h> +#include <wil/com.h> + +// This file uses some identifiers which are defined as macros in Windows headers. +// Include and undefine the macros first thing we do to solve build errors. +#ifdef DeleteFile +#undef DeleteFile +#endif +#endif + #include "DolphinQt/GameList/GameList.h" #include <algorithm> @@ -53,20 +65,6 @@ #include "UICommon/GameFile.h" -#ifdef _WIN32 -#include <QCoreApplication> -#include <shlobj.h> -#include <wil/com.h> - -// This file uses some identifiers which are defined as macros in Windows headers. -// Undefine them for the intellisense parser to solve some red squiggles. -#ifdef __INTELLISENSE__ -#ifdef DeleteFile -#undef DeleteFile -#endif -#endif -#endif - GameList::GameList(QWidget* parent) : QStackedWidget(parent), m_model(this) { m_list_proxy = new ListProxyModel(this); |
