mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 21:28:51 +00:00
fix njoy build for non win32 os, and small osx64 build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1965 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
e6d78d3447
commit
8f2d1136a7
7 changed files with 19 additions and 7 deletions
|
@ -394,6 +394,7 @@ void ConfigBox::DoGetButtons(int GetId)
|
|||
}
|
||||
|
||||
// Check for a XInput trigger
|
||||
#ifdef _WIN32
|
||||
if(XInput)
|
||||
{
|
||||
for(int i = 0; i <= XI_TRIGGER_R; i++)
|
||||
|
@ -406,6 +407,7 @@ void ConfigBox::DoGetButtons(int GetId)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Check for keyboard action
|
||||
if (g_Pressed && Button)
|
||||
|
@ -495,4 +497,4 @@ void ConfigBox::DoGetButtons(int GetId)
|
|||
//Console::Print("IsRunning: %i\n", m_ButtonMappingTimer->IsRunning());
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////// Configure button mapping
|
||||
/////////////////////////////////////////////////////////// Configure button mapping
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue