diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-02-18 19:08:17 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-02-18 19:08:17 -0500 |
| commit | edb43cfe616da48711a3fe5d32d06b9079b2d908 (patch) | |
| tree | d2fac2eadbe9059d0034b9c45d4dd426a6acfc6f /Source | |
| parent | eee549f92b34188b6011a5a253e22f8af1d084f2 (diff) | |
Fix the OSX build.
Turns out Dolphin uses some macros that clash on OSX. However thankfully, this include is only used in Frame.cpp.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Frame.h | 4 |
2 files changed, 4 insertions, 5 deletions
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 <Cocoa/Cocoa.h> +#endif + #include <wx/datetime.h> #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) diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 33af0f11ca..fb69dd988d 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -15,10 +15,6 @@ #include <wx/aui/aui.h> #include <wx/tooltip.h> -#ifdef __APPLE__ -#include <Cocoa/Cocoa.h> -#endif - #include "Common/CDUtils.h" #include "Core/Movie.h" #include "DolphinWX/Globals.h" |