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

Retire the workaround for wxWidgets using the Objective-C reserved 

keyword "id" in the public auibar.h header.

You now need at least r66546 of wxWidgets to build on OS X.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6735 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-04 02:07:17 +00:00
parent daecceb42d
commit 58f5140233
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DSPCore/Src/DSPEmitter.cpp
View File

@ -351,7 +351,7 @@ void DSPEmitter::Compile(u16 start_addr)
if (!unresolvedJumps[i].empty()) if (!unresolvedJumps[i].empty())
{ {
// Check if there were any blocks waiting for this block to be linkable // Check if there were any blocks waiting for this block to be linkable
int size = unresolvedJumps[i].size(); unsigned int size = unresolvedJumps[i].size();
unresolvedJumps[i].remove(start_addr); unresolvedJumps[i].remove(start_addr);
if (unresolvedJumps[i].size() < size) if (unresolvedJumps[i].size() < size)
{ {

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

@ -24,10 +24,6 @@
#include <wx/mstream.h> #include <wx/mstream.h>
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include <wx/artprov.h> #include <wx/artprov.h>
#if defined(__APPLE__)
//id is an objective-c++ type, wx team need to change this
#define id toolid
#endif
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#include <string> #include <string>
#include <vector> #include <vector>

4
Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h
View File

@ -33,10 +33,6 @@
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#if defined(__APPLE__)
//id is an objective-c++ type, wx team need to change this
#define id toolid
#endif
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#include "disassemble.h" #include "disassemble.h"