diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 01:24:26 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 01:24:26 +0000 |
| commit | 52c912a59ed7fdfa82aaa33316ef19060eeece90 (patch) | |
| tree | cf5a31d06915c1c58ae3be181e73ef5137db9c38 /Source/Plugins/Plugin_GCPad/Src | |
| parent | 3a7b8c51c66595addaa259ac595a984cf137f54a (diff) | |
Make wxgl mandatory on OS X.nJoy
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_GCPad/Src')
| -rw-r--r-- | Source/Plugins/Plugin_GCPad/Src/Config.cpp | 2 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_GCPad/Src/GCPad.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_GCPad/Src/Config.cpp b/Source/Plugins/Plugin_GCPad/Src/Config.cpp index e8e9e4ff86..f417349d83 100644 --- a/Source/Plugins/Plugin_GCPad/Src/Config.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/Config.cpp @@ -122,7 +122,7 @@ static const int gcDefaultControls[] = 0x00, // L semi-press 0x00, // R semi-press }; -#elif defined(HAVE_COCOA) && HAVE_COCOA +#elif defined(__APPLE__) // Reference for Cocoa key codes: // http://boredzo.org/blog/archives/2007-05-22/virtual-key-codes { diff --git a/Source/Plugins/Plugin_GCPad/Src/GCPad.h b/Source/Plugins/Plugin_GCPad/Src/GCPad.h index 6f702c0617..52fe385785 100644 --- a/Source/Plugins/Plugin_GCPad/Src/GCPad.h +++ b/Source/Plugins/Plugin_GCPad/Src/GCPad.h @@ -42,9 +42,6 @@ #include <X11/Xutil.h> #include <X11/keysym.h> #include <X11/XKBlib.h> -//no need for Cocoa yet, but I guess ayuanx isn't done yet. -//#elif defined(HAVE_COCOA) && HAVE_COCOA -// #include <Cocoa/Cocoa.h> #endif #include "pluginspecs_pad.h" |