diff --git a/CMakeLists.txt b/CMakeLists.txt index 9197156e8f4c..26684e26e16d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -805,6 +805,7 @@ else() endif() if (WIN32) + include_directories(Externals/WIL/include) include_directories(Externals/OpenAL/include) endif() diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index e1a19f1f0bd1..ae8b3d5449c2 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 +#include +#include + +// 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 @@ -53,20 +65,6 @@ #include "UICommon/GameFile.h" -#ifdef _WIN32 -#include -#include -#include - -// 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);