From 6702e547cb537a5fc819c440fe5f7a734f3c6cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 24 Feb 2017 18:48:26 +0100 Subject: [PATCH] Fix the build on Linux when not using WX from Externals No idea why we were including a Windows specific header *without* a ifdef. --- Source/Core/DolphinWX/NetPlay/NetWindow.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.h b/Source/Core/DolphinWX/NetPlay/NetWindow.h index 32c3075fe7..84b60ad40f 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.h +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.h @@ -14,6 +14,7 @@ #include "Core/NetPlayProto.h" #include "Core/NetPlayServer.h" +#ifdef _WIN32 // 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 // either before or after any Windows headers. @@ -22,6 +23,7 @@ // include ENet headers, which leak Windows header macros. To fix this, explicitly tell // wxWidgets here that it needs to re-clean macros. #include +#endif class CGameListCtrl; class MD5Dialog;