mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-13 16:08:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4955 from leoetlino/wat

Browse Source 
Fix the build on non-Windows platforms when not using WX from Externals
This commit is contained in:
JosJuice 2017-02-26 19:19:06 +01:00 committed by GitHub
commit 6c869f7891
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/NetPlay/NetWindow.h
View File

@ -14,6 +14,7 @@
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "Core/NetPlayServer.h" #include "Core/NetPlayServer.h"
#ifdef _WIN32
// HACK: wxWidgets headers don't play well with some of the macros defined in Windows // HACK: wxWidgets headers don't play well with some of the macros defined in Windows
// headers and perform their own magic to fix things, as long as they're included entirely // headers and perform their own magic to fix things, as long as they're included entirely
// either before or after any Windows headers. // either before or after any Windows headers.
@ -22,6 +23,7 @@
// include ENet headers, which leak Windows header macros. To fix this, explicitly tell // include ENet headers, which leak Windows header macros. To fix this, explicitly tell
// wxWidgets here that it needs to re-clean macros. // wxWidgets here that it needs to re-clean macros.
#include <wx/msw/winundef.h> #include <wx/msw/winundef.h>
#endif
class CGameListCtrl; class CGameListCtrl;
class MD5Dialog; class MD5Dialog;