piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix nowx build.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/Src/WXInputBase.h
View File

@ -18,11 +18,17 @@
#ifndef WXINPUTBASE_H #ifndef WXINPUTBASE_H
#define WXINPUTBASE_H #define WXINPUTBASE_H
#include "Common.h"
#if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h> #include <wx/wx.h>
#endif
namespace InputCommon namespace InputCommon
{ {
#if defined(HAVE_WX) && HAVE_WX
const wxString WXKeyToString(int keycode); const wxString WXKeyToString(int keycode);
const wxString WXKeymodToString(int modifier); const wxString WXKeymodToString(int modifier);
#endif
} }
#endif #endif

5
Source/Plugins/Plugin_GCPad/Src/Config.cpp
View File

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

8
Source/Plugins/Plugin_GCPad/Src/GCPad.cpp
View File

@ -243,15 +243,17 @@ void EmuStateChange(PLUGIN_EMUSTATE newState)
{ {
} }
#if defined(HAVE_WX) && HAVE_WX
// Hack to use wx key events // Hack to use wx key events
volatile bool wxkeystate[400]; volatile bool wxkeystate[WXK_SPECIAL20];
#endif
// Set buttons status from keyboard input. Currently this is done from wxWidgets in the main application. // Set buttons status from keyboard input. Currently this is done from wxWidgets in the main application.
// -------------- // --------------
void PAD_Input(u16 _Key, u8 _UpDown) void PAD_Input(u16 _Key, u8 _UpDown)
{ {
#if defined(__APPLE__) && defined(USE_WX) && USE_WX #if defined(__APPLE__) && defined(USE_WX) && USE_WX
if (_Key < 400) if (_Key < WXK_SPECIAL20)
{ {
wxkeystate[_Key] = _UpDown; wxkeystate[_Key] = _UpDown;
} }
@ -634,7 +636,7 @@ bool IsKey(int Key)
} }
else if (MapKey < 0x1100) else if (MapKey < 0x1100)
#elif defined (USE_WX) && USE_WX #elif defined (USE_WX) && USE_WX
if (MapKey < 400) { if (MapKey < WXK_SPECIAL20) {
Ret = wxkeystate[MapKey]; Ret = wxkeystate[MapKey];
} }
else if (MapKey < 0x1100) else if (MapKey < 0x1100)

6
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

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

6
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -294,8 +294,10 @@ void EmuStateChange(PLUGIN_EMUSTATE newState)
g_EmulatorState = newState; g_EmulatorState = newState;
} }
#if defined(HAVE_WX) && HAVE_WX
// Hack to use wx key events // Hack to use wx key events
volatile bool wxkeystate[400]; volatile bool wxkeystate[WXK_SPECIAL20];
#endif
// Set buttons status from keyboard input. Currently this is done from // Set buttons status from keyboard input. Currently this is done from
// wxWidgets in the main application. // wxWidgets in the main application.
@ -303,7 +305,7 @@ volatile bool wxkeystate[400];
void Wiimote_Input(u16 _Key, u8 _UpDown) void Wiimote_Input(u16 _Key, u8 _UpDown)
{ {
#if defined(__APPLE__) && defined(USE_WX) && USE_WX #if defined(__APPLE__) && defined(USE_WX) && USE_WX
if (_Key < 400) if (_Key < WXK_SPECIAL20)
{ {
wxkeystate[_Key] = _UpDown; wxkeystate[_Key] = _UpDown;
} }