The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-22 03:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

A few changes to the GCPadNew needed to compile in linux, and put GCPadNew back into the linux build. Also changed file properties to eol-style native.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5268 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-04-02 02:48:24 +00:00
parent 9e1d956e98
commit 2742be1c2e
30 changed files with 5551 additions and 5546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -77,16 +77,12 @@ dirs = [
'Source/Plugins/Plugin_DSP_HLE/Src', 'Source/Plugins/Plugin_DSP_HLE/Src',
'Source/Plugins/Plugin_DSP_LLE/Src', 'Source/Plugins/Plugin_DSP_LLE/Src',
'Source/Plugins/Plugin_GCPad/Src', 'Source/Plugins/Plugin_GCPad/Src',
'Source/Plugins/Plugin_GCPadNew/Src',
'Source/Plugins/Plugin_Wiimote/Src', 'Source/Plugins/Plugin_Wiimote/Src',
'Source/Core/DolphinWX/Src', 'Source/Core/DolphinWX/Src',
'Source/Core/DebuggerWX/Src', 'Source/Core/DebuggerWX/Src',
] ]
if sys.platform == 'darwin':
dirs += [
'Source/Plugins/Plugin_GCPadNew/Src'
]
builders = {} builders = {}
if sys.platform == 'darwin': if sys.platform == 'darwin':
from plistlib import writePlist from plistlib import writePlist

8
Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp
View File

@ -113,10 +113,12 @@ void ControlChooser::UpdateGUI()
// make sure it's a valid device // make sure it's a valid device
if ( control_reference->device ) if ( control_reference->device )
{
if ( control_reference->is_input ) if ( control_reference->is_input )
{ {
// for inputs // for inputs
std::vector<ControllerInterface::Device::Input*>::const_iterator i = control_reference->device->Inputs().begin(), std::vector<ControllerInterface::Device::Input*>::const_iterator
i = control_reference->device->Inputs().begin(),
e = control_reference->device->Inputs().end(); e = control_reference->device->Inputs().end();
for ( ; i!=e; ++i ) for ( ; i!=e; ++i )
control_lbox->Append( wxString::FromAscii( (*i)->GetName().c_str() ) ); control_lbox->Append( wxString::FromAscii( (*i)->GetName().c_str() ) );
@ -124,11 +126,13 @@ void ControlChooser::UpdateGUI()
else else
{ {
// for outputs // for outputs
std::vector<ControllerInterface::Device::Output*>::const_iterator i = control_reference->device->Outputs().begin(), std::vector<ControllerInterface::Device::Output*>::const_iterator
i = control_reference->device->Outputs().begin(),
e = control_reference->device->Outputs().end(); e = control_reference->device->Outputs().end();
for ( ; i!=e; ++i ) for ( ; i!=e; ++i )
control_lbox->Append( wxString::FromAscii( (*i)->GetName().c_str() ) ); control_lbox->Append( wxString::FromAscii( (*i)->GetName().c_str() ) );
} }
}
// logic not 100% right here for a poorly formated qualifier // logic not 100% right here for a poorly formated qualifier
// but its just for selecting crap in the listbox // but its just for selecting crap in the listbox

5
Source/Plugins/Plugin_GCPadNew/Src/GCPadNew.cpp
View File

@ -10,6 +10,11 @@
#endif #endif
#include "Config.h" #include "Config.h"
#if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h>
Display* GCdisplay;
#endif
#define CIFACE_PLUGIN_VERSION 0x0100 #define CIFACE_PLUGIN_VERSION 0x0100
#define CIFACE_PLUGIN_BRANDING /*"Billiard's"//*/"Dolphin" #define CIFACE_PLUGIN_BRANDING /*"Billiard's"//*/"Dolphin"