Link the video plugin statically into the main binary on OS X.

This makes the OS X build more robust and should help pave the
way for the integration of the video plugins as well as LTO.

There are now no more global class level namespace conflicts left,
as evidenced by the fact that Dolphin can be linked with -all_load,
not that you would want to.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6958 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-29 04:52:19 +00:00
commit 1bcad428ea
25 changed files with 145 additions and 178 deletions

View file

@ -19,7 +19,7 @@
#include "DSPRegisterView.h"
wxString CRegTable::GetValue(int row, int col)
wxString CDSPRegTable::GetValue(int row, int col)
{
if (row < 32) // 32 "normal" regs
{
@ -33,11 +33,11 @@ wxString CRegTable::GetValue(int row, int col)
return wxString::FromAscii("");
}
void CRegTable::SetValue(int, int, const wxString &)
void CDSPRegTable::SetValue(int, int, const wxString &)
{
}
void CRegTable::UpdateCachedRegs()
void CDSPRegTable::UpdateCachedRegs()
{
if (m_CachedCounter == g_dsp.step_counter)
{
@ -53,7 +53,7 @@ void CRegTable::UpdateCachedRegs()
}
}
wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
{
wxGridCellAttr *attr = new wxGridCellAttr();
@ -79,7 +79,7 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
DSPRegisterView::DSPRegisterView(wxWindow *parent, wxWindowID id)
: wxGrid(parent, id, wxDefaultPosition, wxSize(130, 120))
{
SetTable(new CRegTable(), true);
SetTable(new CDSPRegTable(), true);
SetRowLabelSize(0);
SetColLabelSize(0);
DisableDragRowSize();
@ -89,6 +89,6 @@ DSPRegisterView::DSPRegisterView(wxWindow *parent, wxWindowID id)
void DSPRegisterView::Update()
{
((CRegTable *)GetTable())->UpdateCachedRegs();
((CDSPRegTable *)GetTable())->UpdateCachedRegs();
ForceRefresh();
}