added the wiimote config to the dolphin.ini options.

also commented out the wiimote loading. cause the plugin can't do anything yet it wont load dolphin to start the game.
I also renamed the wiimote plugin. removing the test part. yes its a test but in the end its meant to become a full wiimote plugin right?

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@509 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/Core.cpp

@@ -132,10 +132,10 @@ bool Init(const SCoreStartupParameter _CoreParameter)
 		PanicAlert("Failed to load video plugin %s", g_CoreStartupParameter.m_strVideoPlugin.c_str());
 		return false;
 	}
-	if (!PluginWiimote::LoadPlugin(g_CoreStartupParameter.m_strWiimotePlugin.c_str())) {
+	/*if (!PluginWiimote::LoadPlugin(g_CoreStartupParameter.m_strWiimotePlugin.c_str())) {
 		PanicAlert("Failed to load Wiimote plugin %s", g_CoreStartupParameter.m_strWiimotePlugin.c_str());
 		return false;
-	}
+	}*/
 
 #ifdef _WIN32
 	if (PluginDSP::DllDebugger)

Source/Core/DolphinWX/Src/Config.cpp

@@ -62,6 +62,7 @@ void SConfig::SaveSettings()
 		ini.Set("Core", "GFXPlugin",  m_LocalCoreStartupParameter.m_strVideoPlugin);
 		ini.Set("Core", "DSPPlugin",  m_LocalCoreStartupParameter.m_strDSPPlugin);
 		ini.Set("Core", "PadPlugin",  m_LocalCoreStartupParameter.m_strPadPlugin);
+		ini.Set("Core", "WiiMotePlugin",  m_LocalCoreStartupParameter.m_strWiimotePlugin);
 
 		ini.Set("Core", "HLEBios",        m_LocalCoreStartupParameter.bHLEBios);
 		ini.Set("Core", "UseDynarec",     m_LocalCoreStartupParameter.bUseJIT);
@@ -85,6 +86,7 @@ void SConfig::LoadSettings()
 		ini.Get("Default", "GFXPlugin", &m_DefaultGFXPlugin);
 		ini.Get("Default", "DSPPlugin", &m_DefaultDSPPlugin);
 		ini.Get("Default", "PadPlugin", &m_DefaultPADPlugin);
+		ini.Get("Default", "WiiMotePlugin", &m_DefaultWiiMotePlugin);
 	}
 
 	// misc
@@ -112,7 +114,7 @@ void SConfig::LoadSettings()
 		ini.Get("Core", "GFXPlugin",  &m_LocalCoreStartupParameter.m_strVideoPlugin, m_DefaultGFXPlugin.c_str());
 		ini.Get("Core", "DSPPlugin",  &m_LocalCoreStartupParameter.m_strDSPPlugin, m_DefaultDSPPlugin.c_str());
 		ini.Get("Core", "PadPlugin",  &m_LocalCoreStartupParameter.m_strPadPlugin, m_DefaultPADPlugin.c_str());
-
+		ini.Get("Core", "WiiMotePlugin",  &m_LocalCoreStartupParameter.m_strWiimotePlugin, m_DefaultWiiMotePlugin.c_str());
 		ini.Get("Core", "HLEBios",     &m_LocalCoreStartupParameter.bHLEBios,		true);
 		ini.Get("Core", "UseDynarec",  &m_LocalCoreStartupParameter.bUseJIT,		true);
 		ini.Get("Core", "UseDualCore", &m_LocalCoreStartupParameter.bUseDualCore,	false);

Source/Core/DolphinWX/Src/Config.h

@@ -29,6 +29,7 @@ struct SConfig
 	std::string m_DefaultGFXPlugin;
 	std::string m_DefaultDSPPlugin;
 	std::string m_DefaultPADPlugin;
+	std::string m_DefaultWiiMotePlugin;
 
 	// name of the last used filename
 	std::string m_LastFilename;

Source/Core/DolphinWX/Src/Frame.cpp

@@ -481,6 +481,13 @@ void CFrame::OnPluginPAD(wxCommandEvent& WXUNUSED (event))
 			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strPadPlugin
 			);
 }
+void CFrame::OnPluginWiiMote(wxCommandEvent& WXUNUSED (event))
+{
+	CPluginManager::GetInstance().OpenConfig(
+			GetHandle(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strWiimotePlugin
+			);
+}
 
 void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event))
 {

Source/Core/DolphinWX/Src/Frame.h

@@ -58,6 +58,7 @@ class CFrame
 		void OnPluginGFX(wxCommandEvent& event);
 		void OnPluginDSP(wxCommandEvent& event);
 		void OnPluginPAD(wxCommandEvent& event);
+		void OnPluginWiiMote(wxCommandEvent& event);
 		void OnOpen(wxCommandEvent& event);
 		void OnPlay(wxCommandEvent& event);
 		void OnStop(wxCommandEvent& event);

Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="Plugin_Wiimote_Test"
+	Name="Plugin_Wiimote"
 	ProjectGUID="{8D612734-FAA5-4B8A-804F-4DEA2367D495}"
 	RootNamespace="Plugin_Wiimote_Test"
 	Keyword="Win32Proj"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib winmm.lib rpcrt4.lib"
-				OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_WiimoteTest.dll"
+				OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_Wiimote.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
 				GenerateDebugInformation="false"
@@ -276,6 +276,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -314,7 +315,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib winmm.lib rpcrt4.lib"
-				OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_WiimoteTest.dll"
+				OutputFile="..\..\..\Binary\x64\Plugins\Plugin_WiimoteTest.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
 				GenerateDebugInformation="false"

Source/Plugins/Plugin_Wiimote_Test/Src/SConscript

@@ -2,9 +2,9 @@ Import('env')
 import sys
 
 if sys.platform == 'darwin':
-	output = "../../../../Binary/mac/Plugins/Plugin_Wiimote_Test.so"
+	output = "../../../../Binary/mac/Plugins/Plugin_Wiimote.so"
 else:
-	output = "../../../../Binary/linux/Plugins/Plugin_Wiimote_Test.so"
+	output = "../../../../Binary/linux/Plugins/Plugin_Wiimote.so"
 
 files = [
 	"main.cpp",