Compile fix, remove PanicAlert from nJoy SDL

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

3 files changed, 23 insertions, 19 deletions

diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index c726f6ad5f..ac11f14e52 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -30,7 +30,9 @@
 #include "D3DPostprocess.h"
 #include "D3DUtil.h"
 #include "VertexShaderManager.h"
+#include "VertexShaderCache.h"
 #include "PixelShaderManager.h"
+#include "PixelShaderCache.h"
 #include "TextureCache.h"
 #include "Utils.h"
 #include "EmuWindow.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
index 3e58d8d1fc..dd12018a45 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
@@ -28,7 +28,9 @@
 #include "BPStructs.h"
 #include "XFStructs.h"
 #include "VertexShaderManager.h"
+#include "VertexShaderCache.h"
 #include "PixelShaderManager.h"
+#include "PixelShaderCache.h"
 #include "Utils.h"
 
 using namespace D3D;
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index e737a82cc7..651b15463e 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // Project description
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 // Name: nJoy 
 // Description: A Dolphin Compatible Input Plugin
 //
@@ -32,13 +32,13 @@
 
 ////////////////////////
 // Include
-// ŻŻŻŻŻŻŻŻŻ
+// 
 #include "nJoy.h"
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Variables
-// ŻŻŻŻŻŻŻŻŻ
+// 
 
 // Rumble in windows
 #define _CONTROLLER_STATE_H // avoid certain declarations in nJoy.h
@@ -64,7 +64,7 @@ void __Logv(int log, int v, const char *format, ...) {}
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // wxWidgets
-// ŻŻŻŻŻŻŻŻŻ
+// 
 #if defined(HAVE_WX) && HAVE_WX
 	class wxDLLApp : public wxApp
 	{
@@ -81,7 +81,7 @@ void __Logv(int log, int v, const char *format, ...) {}
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // DllMain 
-// ŻŻŻŻŻŻŻ
+// 
 #ifdef _WIN32
 BOOL APIENTRY DllMain(	HINSTANCE hinstDLL,	// DLL module handle
 						DWORD dwReason,		// reason called
@@ -117,10 +117,10 @@ BOOL APIENTRY DllMain(	HINSTANCE hinstDLL,	// DLL module handle
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Input Plugin Functions (from spec's)
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 
 // Get properties of plugin
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 {
 	_PluginInfo->Version = 0x0100;
@@ -138,7 +138,7 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 }
 
 // Call config dialog
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void DllConfig(HWND _hParent)
 {		
 	#ifdef _WIN32
@@ -177,7 +177,7 @@ void DllDebugger(HWND _hParent, bool Show) {
 }
 
 // Init PAD (start emulation)
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void PAD_Initialize(SPADInitialize _PADInitialize)
 {	
 	emulator_running = TRUE;
@@ -212,7 +212,7 @@ void PAD_Initialize(SPADInitialize _PADInitialize)
 }
 
 // Shutdown PAD (stop emulation)
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void PAD_Shutdown()
 {
 	if (joysticks[0].enabled)
@@ -245,7 +245,7 @@ void PAD_Shutdown()
 
 
 // Set PAD status
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
 {
 	if (!joysticks[_numPAD].enabled)
@@ -365,7 +365,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
 
 
 // Set PAD attached pads
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 unsigned int PAD_GetAttachedPads()
 {
 	unsigned int connected = 0;
@@ -388,10 +388,10 @@ unsigned int PAD_GetAttachedPads()
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Custom Functions
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 
 // Read buttons status. Called from GetJoyState().
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void ReadButton(int controller, int button)
 {
 	int ctl_button = joysticks[controller].buttons[button];
@@ -402,7 +402,7 @@ void ReadButton(int controller, int button)
 }
 
 // Request joystick state
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 void GetJoyState(int controller)
 {
 	SDL_JoystickUpdate();
@@ -420,8 +420,8 @@ void GetJoyState(int controller)
 	ReadButton(controller, CTL_Y_BUTTON);
 	ReadButton(controller, CTL_Z_TRIGGER);
 	ReadButton(controller, CTL_START);
-
-	PanicAlert("%i", CTL_A_BUTTON);
+	// Is there a purpose to this alert?
+	// PanicAlert("%i", CTL_A_BUTTON);
 	
 	//
 	if (joysticks[controller].halfpress < joyinfo[controller].NumButtons)
@@ -442,7 +442,7 @@ void GetJoyState(int controller)
 }
 
 // Search attached devices
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 int Search_Devices()
 {
 	// load config
@@ -475,7 +475,7 @@ int Search_Devices()
 
 	#ifdef _DEBUG
 	fprintf(pFile, "Scanning for devices\n");
-	fprintf(pFile, "ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ\n");
+	fprintf(pFile, "\n");
 	#endif
 	
 	for(int i = 0; i < numjoy; i++ )