Added GCpad to SConstruct, should compile fine on Linux and Mac OSX now.

(some things need cleanup, waiting for ayuanx to finish it)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4932 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st 2010-01-23 12:59:02 +00:00
parent 9ec5ee94b4
commit 6b2466c869
9 changed files with 31 additions and 12 deletions

View File

@ -81,7 +81,7 @@ dirs = [
'Source/Plugins/Plugin_DSP_HLE/Src',
'Source/Plugins/Plugin_DSP_LLE/Src',
'Source/Plugins/Plugin_PadSimple/Src',
'Source/Plugins/Plugin_nJoy_SDL/Src',
'Source/Plugins/Plugin_GCpad',
'Source/Plugins/Plugin_Wiimote/Src',
'Source/Core/DolphinWX/Src',
'Source/Core/DebuggerWX/Src',

View File

@ -21,7 +21,7 @@
#include "Common.h"
#include "IniFile.h"
#include "Config.h"
#include "GCpad.h"
#include "GCPad.h"
static const char* gcControlNames[] =
{

View File

@ -19,7 +19,7 @@
#include "math.h" // System
#include "ConfigBox.h"
#include "Config.h"
#include "GCpad.h"
#include "GCPad.h"
#if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@ -363,7 +363,7 @@ void GCPadConfigDialog::UpdateGUI()
}
#elif defined(HAVE_X11) && HAVE_X11
char keyStr[10] = {0};
for (int x = 0; x <= IDB_TGR_SEMI_R - IDB_BTN_A; x++)
for (int x = 0; x <= IDB_SHDR_SEMI_R - IDB_BTN_A; x++)
{
InputCommon::XKeyToString(GCMapping[m_Page].Button[x + EGC_A], keyStr);
m_Button_GC[x][m_Page]->SetLabel(wxString::FromAscii(keyStr));

View File

@ -29,7 +29,7 @@
#include <wx/panel.h>
#include <wx/gbsizer.h>
#include "GCpad.h"
#include "GCPad.h"
class GCPadConfigDialog : public wxDialog
{

View File

@ -17,7 +17,7 @@
#include "Config.h"
#include "ConfigBox.h"
#include "GCpad.h"
#include "GCPad.h"
// Replace the harder to understand -1 with "" for the sake of user friendliness

View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include "GCpad.h"
#include "GCPad.h"
#include "Config.h"
#include "LogManager.h"
#if defined(HAVE_WX) && HAVE_WX
@ -43,6 +43,9 @@ int NumPads = 0, NumGoodPads = 0, g_ID = 0;
#ifdef _WIN32
HWND m_hWnd = NULL; // Handle to window
#endif
#if defined(HAVE_X11) && HAVE_X11
Display* WMdisplay;
#endif
SPADInitialize *g_PADInitialize = NULL;
PLUGIN_GLOBALS* globals = NULL;
@ -179,6 +182,9 @@ void Initialize(void *init)
#ifdef _WIN32
m_hWnd = (HWND)g_PADInitialize->hWnd;
#endif
#if defined(HAVE_X11) && HAVE_X11
WMdisplay = (Display*)g_PADInitialize->hWnd;
#endif
if (!g_SearchDeviceDone)
{
@ -452,7 +458,7 @@ bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_N
// Close opened devices first
Close_Devices();
bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads, _NumGoodPads);
bool success = InputCommon::SearchDevices(_joyinfo, _NumPads, _NumGoodPads);
if (_NumGoodPads == 0)
return false;
@ -472,7 +478,7 @@ bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_N
}
}
return Success;
return success;
}
void GetAxisState(CONTROLLER_MAPPING_GC &_GCMapping)

View File

@ -23,7 +23,17 @@
#include <vector> // System
#include <cstdio>
#include "../../Core/InputCommon/Src/SDL.h" // Core
#ifdef _WIN32
#include "../../Core/InputCommon/Src/XInput.h"
#elif defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h>
#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"
@ -137,6 +147,9 @@ extern std::vector<InputCommon::CONTROLLER_INFO> joyinfo;
#ifdef _WIN32
extern HWND m_hWnd; // Handle to window
#endif
#if defined(HAVE_X11) && HAVE_X11
extern Display* WMdisplay;
#endif
// Custom Functions

View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include "GCpad.h"
#include "GCPad.h"
#include "FileUtil.h"
#include "ChunkFile.h"

View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include "GCpad.h"
#include "GCPad.h"
#ifdef _WIN32
#include "XInput.h"