ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/Frame.cpp
View File

@ -10,6 +10,10 @@
// m_Panel. The new child window handle that is returned by CreateWindow() can // m_Panel. The new child window handle that is returned by CreateWindow() can
// be accessed from Core::GetWindowHandle(). // be accessed from Core::GetWindowHandle().
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
#include <wx/datetime.h> #include <wx/datetime.h>
#include "Common/Common.h" #include "Common/Common.h"
@ -43,7 +47,6 @@ extern "C" {
#include "DolphinWX/resources/Dolphin.c" // Dolphin icon #include "DolphinWX/resources/Dolphin.c" // Dolphin icon
}; };
#ifdef _WIN32 #ifdef _WIN32
// I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */ // I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */
HWND MSWGetParent_(HWND Parent) HWND MSWGetParent_(HWND Parent)

4
Source/Core/DolphinWX/Frame.h
View File

@ -15,10 +15,6 @@
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#include <wx/tooltip.h> #include <wx/tooltip.h>
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
#include "Common/CDUtils.h" #include "Common/CDUtils.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "DolphinWX/Globals.h" #include "DolphinWX/Globals.h"