From 24a4d1a1e03a67b25d8a27ff2cc19d7bb314106a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 13 Feb 2010 21:12:16 +0000 Subject: [PATCH] Ok, now the mac build should be fixed git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5051 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_GCPad/Src/GCPad.cpp | 3 ++- Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp index 9bcf4ddb17..87b20d223d 100644 --- a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp @@ -606,6 +606,7 @@ bool IsKey(int Key) if (MapKey < 256) { Ret = GetAsyncKeyState(MapKey); // Keyboard (Windows) + } #elif defined HAVE_X11 && HAVE_X11 if (MapKey < 256 || MapKey > 0xf000) { @@ -614,8 +615,8 @@ bool IsKey(int Key) XQueryKeymap(GCdisplay, keys); keyCode = XKeysymToKeycode(GCdisplay, MapKey); Ret = (keys[keyCode/8] & (1 << (keyCode%8))); // Keyboard (Linux) + } #endif - } else if (MapKey < 0x1100) { Ret = SDL_JoystickGetButton(GCMapping[g_ID].joy, MapKey - 0x1000); // Pad button diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp index bee0ddf6ad..6e73506975 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp @@ -307,6 +307,7 @@ bool IsKey(int Key) if (MapKey < 256) { Ret = GetAsyncKeyState(MapKey); // Keyboard (Windows) + } #elif defined(HAVE_X11) && HAVE_X11 if (MapKey < 256 || MapKey >= 0xf000) { @@ -315,8 +316,8 @@ bool IsKey(int Key) XQueryKeymap(WMdisplay, keys); keyCode = XKeysymToKeycode(WMdisplay, MapKey); Ret = (keys[keyCode/8] & (1 << (keyCode%8))); // Keyboard (Linux) -#endif } +#endif else if (MapKey < 0x1100) { Ret = SDL_JoystickGetButton(WiiMapping[g_ID].joy, MapKey - 0x1000); // Pad button