fix linux build, last njoy commit broke it :P

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

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index b056235e91..9588fb0ab6 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -44,6 +44,7 @@ bool emulator_running = FALSE;
 

 // Handle to window

 HWND m_hWnd;

+bool g_rumbleEnable = FALSE;

 

 // Rumble in windows

 #ifdef _WIN32

@@ -55,7 +56,6 @@ DWORD                   g_dwNumForceFeedbackAxis = 0;
 INT                     g_nXForce = 0;

 INT                     g_nYForce = 0;

 

-bool g_rumbleEnable = FALSE;

 #define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }

 

 HRESULT InitDirectInput(HWND hDlg);

@@ -410,7 +410,6 @@ void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus)
 	}

 	else

 		g_rumbleEnable = TRUE;

-	#endif

 

 	if (g_rumbleEnable)

 	{

@@ -419,6 +418,7 @@ void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus)
 		if(g_pEffect)

 			g_pEffect->Start(1, 0);

 	}

+	#endif

 }

 

 // Set PAD rumble

@@ -884,4 +884,4 @@ HRESULT SetDeviceForcesXY()
     return g_pEffect->SetParameters(&eff, DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS | DIEP_START);

 }

 

-#endif
\ No newline at end of file
+#endif