summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/X11InputBase.cpp
diff options
context:
space:
mode:
authorSonicadvance1 <sonicadvance1@gmail.com>2009-07-13 06:34:12 +0000
committerSonicadvance1 <sonicadvance1@gmail.com>2009-07-13 06:34:12 +0000
commit4cfcf9bdd588b1b9f0ad219c3f76896e31511867 (patch)
treea5c2e4e2dedc73b2f992b3f40356657bca99c39a /Source/Core/InputCommon/Src/X11InputBase.cpp
parentd779554ff37cafe9ecc854b33ace81e94094dead (diff)
Sorry for intruding in to the core. Fixed NoGUI mode in Linux, add back the instruction names as comments in the JIT tables, was a bit hard to find certain instructions.Trying to find a good way to get The JIT dependencies removed in a nice fashion
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3776 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/X11InputBase.cpp')
-rw-r--r--Source/Core/InputCommon/Src/X11InputBase.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/X11InputBase.cpp b/Source/Core/InputCommon/Src/X11InputBase.cpp
index 9cd3edb3b1..6013e2f983 100644
--- a/Source/Core/InputCommon/Src/X11InputBase.cpp
+++ b/Source/Core/InputCommon/Src/X11InputBase.cpp
@@ -1,7 +1,12 @@
#include "X11InputBase.h"
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
namespace InputCommon
{
+#ifdef HAVE_WX
+#include <wx/wx.h>
// Taken from wxw source code
KeySym wxCharCodeWXToX(int id)
{
@@ -84,7 +89,7 @@ KeySym wxCharCodeWXToX(int id)
return keySym;
}
-
+#endif
void XKeyToString(unsigned int keycode, char *keyStr) {
switch (keycode) {
@@ -128,4 +133,4 @@ void XKeyToString(unsigned int keycode, char *keyStr) {
sprintf(keyStr, "%c", toupper(keycode));
}
}
-} \ No newline at end of file
+}