Merge pull request #9560 from JosJuice/cmake-msvc-wil

CMake: Include WIL headers

CMakeLists.txt

@@ -805,6 +805,7 @@ else()
 endif()
 
 if (WIN32)
+  include_directories(Externals/WIL/include)
   include_directories(Externals/OpenAL/include)
 endif()
 

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);