From edb43cfe616da48711a3fe5d32d06b9079b2d908 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 18 Feb 2014 19:08:17 -0500 Subject: Fix the OSX build. Turns out Dolphin uses some macros that clash on OSX. However thankfully, this include is only used in Frame.cpp. --- Source/Core/DolphinWX/Frame.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 194699b024..11e444bc8c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,6 +10,10 @@ // m_Panel. The new child window handle that is returned by CreateWindow() can // be accessed from Core::GetWindowHandle(). +#ifdef __APPLE__ +#include +#endif + #include #include "Common/Common.h" @@ -43,7 +47,6 @@ extern "C" { #include "DolphinWX/resources/Dolphin.c" // Dolphin icon }; - #ifdef _WIN32 // I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */ HWND MSWGetParent_(HWND Parent) -- cgit v1.2.3