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

@ -123,7 +123,7 @@ static const int gcDefaultControls[] =
0x00, // L semi-press
0x00, // R semi-press
};
#else defined(USE_WX) && USE_WX
#elif defined(USE_WX) && USE_WX
{
'X', // A
'Z', // B
@ -150,9 +150,10 @@ static const int gcDefaultControls[] =
0, // L semi-press
0, // R semi-press
};
#else
{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
#endif
Config g_Config;
// Run when created