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

Ok, now the mac build should be fixed

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5051 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-02-13 21:12:16 +00:00
parent 47609c4524
commit 24a4d1a1e0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Plugins/Plugin_GCPad/Src/GCPad.cpp
View File

@ -606,6 +606,7 @@ bool IsKey(int Key)
if (MapKey < 256) if (MapKey < 256)
{ {
Ret = GetAsyncKeyState(MapKey); // Keyboard (Windows) Ret = GetAsyncKeyState(MapKey); // Keyboard (Windows)
}
#elif defined HAVE_X11 && HAVE_X11 #elif defined HAVE_X11 && HAVE_X11
if (MapKey < 256 || MapKey > 0xf000) if (MapKey < 256 || MapKey > 0xf000)
{ {
@ -614,8 +615,8 @@ bool IsKey(int Key)
XQueryKeymap(GCdisplay, keys); XQueryKeymap(GCdisplay, keys);
keyCode = XKeysymToKeycode(GCdisplay, MapKey); keyCode = XKeysymToKeycode(GCdisplay, MapKey);
Ret = (keys[keyCode/8] & (1 << (keyCode%8))); // Keyboard (Linux) Ret = (keys[keyCode/8] & (1 << (keyCode%8))); // Keyboard (Linux)
}
#endif #endif
}
else if (MapKey < 0x1100) else if (MapKey < 0x1100)
{ {
Ret = SDL_JoystickGetButton(GCMapping[g_ID].joy, MapKey - 0x1000); // Pad button Ret = SDL_JoystickGetButton(GCMapping[g_ID].joy, MapKey - 0x1000); // Pad button

3
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

@ -307,6 +307,7 @@ bool IsKey(int Key)
if (MapKey < 256) if (MapKey < 256)
{ {
Ret = GetAsyncKeyState(MapKey); // Keyboard (Windows) Ret = GetAsyncKeyState(MapKey); // Keyboard (Windows)
}
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
if (MapKey < 256 || MapKey >= 0xf000) if (MapKey < 256 || MapKey >= 0xf000)
{ {
@ -315,8 +316,8 @@ bool IsKey(int Key)
XQueryKeymap(WMdisplay, keys); XQueryKeymap(WMdisplay, keys);
keyCode = XKeysymToKeycode(WMdisplay, MapKey); keyCode = XKeysymToKeycode(WMdisplay, MapKey);
Ret = (keys[keyCode/8] & (1 << (keyCode%8))); // Keyboard (Linux) Ret = (keys[keyCode/8] & (1 << (keyCode%8))); // Keyboard (Linux)
#endif
} }
#endif
else if (MapKey < 0x1100) else if (MapKey < 0x1100)
{ {
Ret = SDL_JoystickGetButton(WiiMapping[g_ID].joy, MapKey - 0x1000); // Pad button Ret = SDL_JoystickGetButton(WiiMapping[g_ID].joy, MapKey - 0x1000); // Pad button