OpenGL: Added option to build without WxWidgets in Windows to, if it has anything to do with the FreeLibrary() hanging. It doesn't seem to do, but now it's easier to compile without it at least.

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

4 files changed, 16 insertions, 11 deletions

diff --git a/Source/Core/Common/Src/Setup.h b/Source/Core/Common/Src/Setup.h
index ae7eb63637..ff7c7cf126 100644
--- a/Source/Core/Common/Src/Setup.h
+++ b/Source/Core/Common/Src/Setup.h
@@ -36,8 +36,11 @@
 // This may remove sound artifacts in Wario Land Shake It and perhaps other games

 //#define SETUP_AVOID_SOUND_ARTIFACTS

 

-// This may fix a problem with Stop and Start that I described in the comments to revision 2,139

-//#define SETUP_FREE_PLUGIN_ON_BOOT

+/* This may fix a problem with Stop and Start that I described in the comments to revision 2,139,

+   and in the comments in the File Description for PluginManager.cpp */

+//#define SETUP_FREE_VIDEO_PLUGIN_ON_BOOT

+//#define SETUP_FREE_DSP_PLUGIN_ON_BOOT

+//#define SETUP_DONT_FREE_PLUGIN_ON_STOP

 

 /* This will avoid deleting the g_EmuThread after Stop, that may hang when we are rendering to a child

    window, however, I didn't seem to need this any more */

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 82e7eec1ac..b448a2c59a 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -335,8 +335,8 @@ THREAD_RETURN EmuThread(void *pArg)
 	VideoInitialize.pKeyPress           = Callback_KeyPress;
 	VideoInitialize.bWii                = _CoreParameter.bWii;
 	VideoInitialize.bUseDualCore		= _CoreParameter.bUseDualCore;
-	// Needed for Stop and Start
-	#ifdef SETUP_FREE_PLUGIN_ON_BOOT
+	// May be needed for Stop and Start
+	#ifdef SETUP_FREE_VIDEO_PLUGIN_ON_BOOT
 		Plugins.FreeVideo();
 	#endif
 	Plugins.GetVideo()->Initialize(&VideoInitialize); // Call the dll
@@ -359,8 +359,8 @@ THREAD_RETURN EmuThread(void *pArg)
 	dspInit.pGetAudioStreaming = AudioInterface::Callback_GetStreaming;
 	dspInit.pEmulatorState = (int *)PowerPC::GetStatePtr();
 	dspInit.bWii = _CoreParameter.bWii;
-	// Needed for Stop and Start
-	#ifdef SETUP_FREE_PLUGIN_ON_BOOT
+	// May be needed for Stop and Start
+	#ifdef SETUP_FREE_DSP_PLUGIN_ON_BOOT
 		Plugins.FreeDSP();
 	#endif
 	Plugins.GetDSP()->Initialize((void *)&dspInit);
diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp
index d646c7d6a5..6f6b825053 100644
--- a/Source/Core/Core/Src/PluginManager.cpp
+++ b/Source/Core/Core/Src/PluginManager.cpp
@@ -190,7 +190,8 @@ bool CPluginManager::InitPlugins()
 void CPluginManager::ShutdownPlugins()
 {
 	for (int i = 0; i < MAXPADS; i++) {
-		if (m_pad[i]) {
+		if (m_pad[i])
+		{
 			m_pad[i]->Shutdown();
 			//delete m_pad[i];
 		}
@@ -200,8 +201,10 @@ void CPluginManager::ShutdownPlugins()
 	for (int i = 0; i < MAXWIIMOTES; i++)
 	{
 		if (m_wiimote[i])
+		{
 			m_wiimote[i]->Shutdown();
-		//delete m_wiimote[i];
+			//delete m_wiimote[i];
+		}
 		//m_wiimote[i] = NULL;
 	}
 
@@ -209,7 +212,7 @@ void CPluginManager::ShutdownPlugins()
 	{
 		m_video->Shutdown();
 		// With this option, this is done on boot instead
-		#ifndef SETUP_FREE_PLUGIN_ON_BOOT
+		#ifndef SETUP_DONT_FREE_PLUGIN_ON_STOP
 			delete m_video;
 			m_video = NULL;
 		#endif
@@ -220,7 +223,7 @@ void CPluginManager::ShutdownPlugins()
 	{
 		m_dsp->Shutdown();
 		// With this option, this is done on boot instead
-		#ifndef SETUP_FREE_PLUGIN_ON_BOOT
+		#ifndef SETUP_DONT_FREE_PLUGIN_ON_STOP
 			delete m_dsp;
 			m_dsp = NULL;
 		#endif
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 32e0f8449d..24cfa88c96 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -22,7 +22,6 @@
 #define _GLOBALS_H
 
 #include "Common.h"
-#include "Setup.h" // Build with music modification. Define MUSICMOD here.
 
 // Constant Colors
 const unsigned long COLOR_GRAY = 0xDCDCDC;