Moved wiimote_test to wiimote

Some linux compile fixes


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1266 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-23 08:44:02 +00:00
parent 3fdfd6e234
commit 6e4a5d8cda
26 changed files with 11 additions and 9 deletions

View File

@ -71,7 +71,7 @@ dirs = [
'Source/Plugins/Plugin_DSP_NULL/Src', 'Source/Plugins/Plugin_DSP_NULL/Src',
'Source/Plugins/Plugin_PadSimple/Src', 'Source/Plugins/Plugin_PadSimple/Src',
'Source/Plugins/Plugin_nJoy_SDL/Src', 'Source/Plugins/Plugin_nJoy_SDL/Src',
'Source/Plugins/Plugin_Wiimote_Test/Src', 'Source/Plugins/Plugin_Wiimote/Src',
'Source/Core/DolphinWX/Src', 'Source/Core/DolphinWX/Src',
] ]

View File

@ -248,6 +248,8 @@ void Thread::WaitForDeath()
{ {
void* exit_status; void* exit_status;
pthread_join(thread_id, &exit_status); pthread_join(thread_id, &exit_status);
if (exit_status)
fprintf(stderr, "error %d joining thread\n", *(int *)exit_status);
thread_id = 0; thread_id = 0;
} }
} }

View File

@ -589,7 +589,7 @@ void CISOProperties::ActionReplayList_Load()
// Take care of the previous code // Take care of the previous code
if (code.ops.size()) if (code.ops.size())
{ {
code.uiIndex = Cheats->Append(_T(code.name)); code.uiIndex = Cheats->Append(wxString::FromAscii(code.name.c_str()));
ARCodes.push_back(code); ARCodes.push_back(code);
Cheats->Check(code.uiIndex, code.enabled); Cheats->Check(code.uiIndex, code.enabled);
code.ops.clear(); code.ops.clear();
@ -618,9 +618,9 @@ void CISOProperties::ActionReplayList_Load()
if (code.ops.size()) if (code.ops.size())
{ {
code.uiIndex = Cheats->Append(_T(code.name)); code.uiIndex = Cheats->Append(wxString::FromAscii(code.name.c_str()));
ARCodes.push_back(code); ARCodes.push_back(code);
Cheats->Check(code.uiIndex, code.enabled); Cheats->Check(code.uiIndex, code.enabled);
} }
} }
void CISOProperties::ActionReplayList_Save() void CISOProperties::ActionReplayList_Save()
@ -638,4 +638,4 @@ void CISOProperties::ActionReplayList_Save()
} }
} }
GameIni.SetLines("ActionReplay", lines); GameIni.SetLines("ActionReplay", lines);
} }

View File

@ -665,9 +665,9 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card, int page)
m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxString::FromAscii(title)); m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxString::FromAscii(title));
m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxString::FromAscii(comment)); m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxString::FromAscii(comment));
if (!memoryCard[card]->GetNumBlocks(j, &blocks)) blocks = 0; if (!memoryCard[card]->GetNumBlocks(j, &blocks)) blocks = 0;
wxBlock.Printf("%10d", blocks); wxBlock.Printf(wxT("%10d"), blocks);
if (!memoryCard[card]->GetFirstBlock(j,&firstblock)) firstblock = 0; if (!memoryCard[card]->GetFirstBlock(j,&firstblock)) firstblock = 0;
wxFirstBlock.Printf("%10d", firstblock-4); wxFirstBlock.Printf(wxT("%10d"), firstblock-4);
m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock); m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock);
m_MemcardList[card]->SetItem(index,COLUMN_FIRSTBLOCK, wxFirstBlock); m_MemcardList[card]->SetItem(index,COLUMN_FIRSTBLOCK, wxFirstBlock);
m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString); m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString);
@ -695,7 +695,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card, int page)
m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE); m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE);
} }
m_MemcardList[card]->Show(); m_MemcardList[card]->Show();
wxLabel.Printf("%d Free Blocks; %d Free Dir Entries", wxLabel.Printf(wxT("%d Free Blocks; %d Free Dir Entries"),
memoryCard[card]->GetFreeBlocks(), 127 - nFiles); memoryCard[card]->GetFreeBlocks(), 127 - nFiles);
card ? t_StatusRight->SetLabel(wxLabel) : t_StatusLeft->SetLabel(wxLabel); card ? t_StatusRight->SetLabel(wxLabel) : t_StatusLeft->SetLabel(wxLabel);