The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 06:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix linux build, last njoy commit broke it :P

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@127 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-08-03 09:21:04 +00:00
parent bcaa0d1d86
commit e7786f3934
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -1,7 +1,7 @@
import os
import sys
warnings = ' -Wall -Wwrite-strings -Wfloat-equal -Wshadow -Wpointer-arith -Wcast-qual -Wpacked -Wno-conversion'
warnings = ' -Wall -Wwrite-strings -Wfloat-equal -Wshadow -Wpointer-arith -Wpacked -Wno-conversion'
nonactive_warnings = '-Wunreachable-code'

6
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -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
#endif