From 6e4a5d8cdad71c79e393502005bae3bfbaeaae82 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sun, 23 Nov 2008 08:44:02 +0000 Subject: [PATCH] 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 --- SConstruct | 2 +- Source/Core/Common/Src/Thread.cpp | 2 ++ Source/Core/DolphinWX/Src/ISOProperties.cpp | 10 +++++----- Source/Core/DolphinWX/Src/MemcardManager.cpp | 6 +++--- .../Plugin_Wiimote_Test.vcproj | 0 .../Src/Config.cpp | 0 .../Src/Config.h | 0 .../Src/ConfigDlg.cpp | 0 .../Src/ConfigDlg.h | 0 .../Src/Console.cpp | 0 .../Src/Console.h | 0 .../Src/DataReports.cpp | 0 .../Src/EmuDefinitions.cpp | 0 .../Src/EmuDefinitions.h | 0 .../Src/EmuMain.cpp | 0 .../Src/EmuMain.h | 0 .../Src/EmuSubroutines.cpp | 0 .../Src/EmuSubroutines.h | 0 .../Src/Encryption.cpp | 0 .../Src/Encryption.h | 0 .../Src/FillReport.cpp | 0 .../Src/SConscript | 0 .../Src/main.cpp | 0 .../Src/wiimote_hid.h | 0 .../Src/wiimote_real.cpp | 0 .../Src/wiimote_real.h | 0 26 files changed, 11 insertions(+), 9 deletions(-) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Plugin_Wiimote_Test.vcproj (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/Config.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/Config.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/ConfigDlg.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/ConfigDlg.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/Console.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/Console.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/DataReports.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/EmuDefinitions.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/EmuDefinitions.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/EmuMain.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/EmuMain.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/EmuSubroutines.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/EmuSubroutines.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/Encryption.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/Encryption.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/FillReport.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/SConscript (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/main.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/wiimote_hid.h (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/wiimote_real.cpp (100%) rename Source/Plugins/{Plugin_Wiimote_Test => Plugin_Wiimote}/Src/wiimote_real.h (100%) diff --git a/SConstruct b/SConstruct index 4cd365fd77..3c6f9563d6 100644 --- a/SConstruct +++ b/SConstruct @@ -71,7 +71,7 @@ dirs = [ 'Source/Plugins/Plugin_DSP_NULL/Src', 'Source/Plugins/Plugin_PadSimple/Src', 'Source/Plugins/Plugin_nJoy_SDL/Src', - 'Source/Plugins/Plugin_Wiimote_Test/Src', + 'Source/Plugins/Plugin_Wiimote/Src', 'Source/Core/DolphinWX/Src', ] diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index 512e6be345..56188bb9b3 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -248,6 +248,8 @@ void Thread::WaitForDeath() { void* exit_status; pthread_join(thread_id, &exit_status); + if (exit_status) + fprintf(stderr, "error %d joining thread\n", *(int *)exit_status); thread_id = 0; } } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index c8ded255d6..4990d67635 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -589,7 +589,7 @@ void CISOProperties::ActionReplayList_Load() // Take care of the previous code 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); Cheats->Check(code.uiIndex, code.enabled); code.ops.clear(); @@ -618,9 +618,9 @@ void CISOProperties::ActionReplayList_Load() if (code.ops.size()) { - code.uiIndex = Cheats->Append(_T(code.name)); - ARCodes.push_back(code); - Cheats->Check(code.uiIndex, code.enabled); + code.uiIndex = Cheats->Append(wxString::FromAscii(code.name.c_str())); + ARCodes.push_back(code); + Cheats->Check(code.uiIndex, code.enabled); } } void CISOProperties::ActionReplayList_Save() @@ -638,4 +638,4 @@ void CISOProperties::ActionReplayList_Save() } } GameIni.SetLines("ActionReplay", lines); -} \ No newline at end of file +} diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 2bba44fb20..561a507df8 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -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_COMMENT, wxString::FromAscii(comment)); 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; - 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_FIRSTBLOCK, wxFirstBlock); 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]->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); card ? t_StatusRight->SetLabel(wxLabel) : t_StatusLeft->SetLabel(wxLabel); diff --git a/Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote_Test.vcproj similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj rename to Source/Plugins/Plugin_Wiimote/Plugin_Wiimote_Test.vcproj diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Config.cpp b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/Config.cpp rename to Source/Plugins/Plugin_Wiimote/Src/Config.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Config.h b/Source/Plugins/Plugin_Wiimote/Src/Config.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/Config.h rename to Source/Plugins/Plugin_Wiimote/Src/Config.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.cpp rename to Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.h b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.h rename to Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Console.cpp b/Source/Plugins/Plugin_Wiimote/Src/Console.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/Console.cpp rename to Source/Plugins/Plugin_Wiimote/Src/Console.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Console.h b/Source/Plugins/Plugin_Wiimote/Src/Console.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/Console.h rename to Source/Plugins/Plugin_Wiimote/Src/Console.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/DataReports.cpp b/Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/DataReports.cpp rename to Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuDefinitions.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/EmuDefinitions.cpp rename to Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuDefinitions.h b/Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/EmuDefinitions.h rename to Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.cpp rename to Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.h b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.h rename to Source/Plugins/Plugin_Wiimote/Src/EmuMain.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.cpp rename to Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.h b/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.h rename to Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Encryption.cpp b/Source/Plugins/Plugin_Wiimote/Src/Encryption.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/Encryption.cpp rename to Source/Plugins/Plugin_Wiimote/Src/Encryption.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Encryption.h b/Source/Plugins/Plugin_Wiimote/Src/Encryption.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/Encryption.h rename to Source/Plugins/Plugin_Wiimote/Src/Encryption.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp rename to Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/SConscript rename to Source/Plugins/Plugin_Wiimote/Src/SConscript diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/main.cpp rename to Source/Plugins/Plugin_Wiimote/Src/main.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_hid.h b/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_hid.h rename to Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_real.cpp b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_real.cpp rename to Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_real.h b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.h similarity index 100% rename from Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_real.h rename to Source/Plugins/Plugin_Wiimote/Src/wiimote_real.h