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

26 files changed, 11 insertions, 9 deletions

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
index 4b43296d44..4b43296d44 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj
+++ b/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
index 442a05a9e4..442a05a9e4 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Config.cpp
+++ b/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
index 0366f896bf..0366f896bf 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Config.h
+++ b/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
index 237e5e291f..237e5e291f 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.cpp
+++ b/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
index 9b68936349..9b68936349 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.h
+++ b/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
index c077ddd9b8..c077ddd9b8 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Console.cpp
+++ b/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
index 401b374ffd..401b374ffd 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Console.h
+++ b/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
index 8aeaa54092..8aeaa54092 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/DataReports.cpp
+++ b/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
index 9772748e7f..9772748e7f 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuDefinitions.cpp
+++ b/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
index 91a85ec4e1..91a85ec4e1 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuDefinitions.h
+++ b/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
index 49f6bb1c4b..49f6bb1c4b 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.cpp
+++ b/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
index 74a34730a3..74a34730a3 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.h
+++ b/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
index 016931d5a9..016931d5a9 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.cpp
+++ b/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
index 8de7dfa479..8de7dfa479 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.h
+++ b/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
index 5967f05029..5967f05029 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Encryption.cpp
+++ b/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
index c43a416976..c43a416976 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Encryption.h
+++ b/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
index 920f6eaa63..920f6eaa63 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript
index 3c8db4e78a..3c8db4e78a 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript
+++ b/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
index ef9d244ba6..ef9d244ba6 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/main.cpp
+++ b/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
index be4dd6a82a..be4dd6a82a 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_hid.h
+++ b/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
index 7cb8dc7756..7cb8dc7756 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_real.cpp
+++ b/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
index 14edd430d3..14edd430d3 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/wiimote_real.h
+++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.h