Fix nowx build.

We really should integrate the nowx functionality into the main build,
removing nowx and HAVE_WX checks and turning USE_WX into a variable
that defaults to GUI use but can be overridden at the command line.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5630 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-06 21:06:58 +00:00
parent b20c04aa45
commit f4abbdf6b1
5 changed files with 22 additions and 9 deletions

View File

@ -34,8 +34,10 @@
extern SWiimoteInitialize g_WiimoteInitialize;
#if defined(HAVE_WX) && HAVE_WX
// Hack to use wx key events
extern volatile bool wxkeystate[400];
extern volatile bool wxkeystate[WXK_SPECIAL20];
#endif
namespace WiiMoteEmu
{
@ -323,7 +325,7 @@ bool IsKey(int Key)
}
else if (MapKey < 0x1100)
#elif defined (USE_WX) && USE_WX
if (MapKey < 400) {
if (MapKey < WXK_SPECIAL20) {
Ret = wxkeystate[MapKey];
}
else if (MapKey < 0x1100)