Fix the OSX build.

Turns out Dolphin uses some macros that clash on OSX. However thankfully, this include is only used in Frame.cpp.
This commit is contained in:
Lioncash 2014-02-18 19:08:17 -05:00
parent eee549f92b
commit edb43cfe61
2 changed files with 4 additions and 5 deletions

View File

@ -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)

View File

@ -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"