ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

CMake: Include WIL headers
This commit is contained in:
Léo Lam 2021-03-04 12:08:05 +01:00 committed by GitHub
parent 79ee6aae0a 2cb3f663bc
commit 00db622d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

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

26
Source/Core/DolphinQt/GameList/GameList.cpp
View File

@ -2,6 +2,18 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // 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 "DolphinQt/GameList/GameList.h"
#include <algorithm> #include <algorithm>
@ -53,20 +65,6 @@
#include "UICommon/GameFile.h" #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) GameList::GameList(QWidget* parent) : QStackedWidget(parent), m_model(this)
{ {
m_list_proxy = new ListProxyModel(this); m_list_proxy = new ListProxyModel(this);