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:
1 parent
9ec5ee94b4
commit
6b2466c869
9 files changed
+31
-12
No files matched your search
@@ -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));
|
||||
|
||||
Reference in new issue
Block a user