mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-26 03:35:26 +00:00
Linux build fix, code cleanup, and compiler warning removal.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5840 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
19cdaaae89
commit
3e08208f42
@ -12,7 +12,7 @@ files = [
|
||||
|
||||
libs = [
|
||||
'core', 'lzo2', 'discio', 'bdisasm', 'videocommon',
|
||||
'inputcommon', 'inputuicommon', 'common', 'lua', 'z', 'sfml-network',
|
||||
'inputuicommon', 'inputcommon', 'common', 'lua', 'z', 'sfml-network',
|
||||
'SDL'
|
||||
]
|
||||
|
||||
|
@ -65,8 +65,9 @@ THREAD_RETURN UDPWiiThread(void* arg)
|
||||
}
|
||||
|
||||
UDPWiimote::UDPWiimote(const char *_port) :
|
||||
d(new _d) ,x(0),y(0),z(0),nunX(0),nunY(0),
|
||||
pointerX(-0.1),pointerY(-0.1),nunMask(0),mask(0),time(0),port(_port)
|
||||
port(_port),
|
||||
d(new _d) ,x(0),y(0),z(0),nunX(0),nunY(0),
|
||||
pointerX(-0.1),pointerY(-0.1),nunMask(0),mask(0),time(0)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
u_long iMode = 1;
|
||||
@ -299,4 +300,4 @@ void UDPWiimote::getNunchuck(float &_x, float &_y, u8 &_mask)
|
||||
const char * UDPWiimote::getPort()
|
||||
{
|
||||
return port.c_str();
|
||||
}
|
||||
}
|
||||
|
@ -1,25 +1,13 @@
|
||||
#include "UDPWrapper.h"
|
||||
#include "UDPWiimote.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/listbox.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/stattext.h>
|
||||
#include <wx/combobox.h>
|
||||
#include <wx/checkbox.h>
|
||||
#include <wx/notebook.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/spinctrl.h>
|
||||
|
||||
UDPWrapper::UDPWrapper(int indx, const char* const _name) :
|
||||
updIR(false),updAccel(false),
|
||||
updButt(false),udpEn(false),inst(NULL),
|
||||
index(indx),ControllerEmu::ControlGroup(_name,GROUP_TYPE_UDPWII)
|
||||
ControllerEmu::ControlGroup(_name,GROUP_TYPE_UDPWII),
|
||||
inst(NULL), index(indx),
|
||||
updIR(false),updAccel(false),
|
||||
updButt(false),udpEn(false)
|
||||
{
|
||||
char s[5];
|
||||
sprintf(s,"%d",4432+index);
|
||||
@ -114,8 +102,8 @@ public:
|
||||
};
|
||||
|
||||
UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) :
|
||||
wxDialog(parent, -1, wxT("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
|
||||
wrp(_wrp)
|
||||
wxDialog(parent, -1, wxT("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
|
||||
wrp(_wrp)
|
||||
{
|
||||
wxBoxSizer * outer_sizer = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer * sizer1 = new wxBoxSizer(wxVERTICAL);
|
||||
@ -184,4 +172,4 @@ void UDPWrapper::Configure(wxWindow * parent)
|
||||
wxDialog * diag = new UDPConfigDiag(parent,this);
|
||||
diag->ShowModal();
|
||||
diag->Destroy();
|
||||
}
|
||||
}
|
||||
|
@ -1,14 +1,23 @@
|
||||
#ifndef UDPWRAPPER_H
|
||||
#define UDPWRAPPER_H
|
||||
|
||||
#include <Common.h>
|
||||
#include "Common.h"
|
||||
#include "ControllerEmu.h"
|
||||
#include <IniFile.h>
|
||||
#include "IniFile.h"
|
||||
#include <string>
|
||||
|
||||
class wxWindow;
|
||||
class UDPWiimote;
|
||||
class Wiimote;
|
||||
#include <wx/wx.h>
|
||||
#include <wx/listbox.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/stattext.h>
|
||||
#include <wx/combobox.h>
|
||||
#include <wx/checkbox.h>
|
||||
#include <wx/notebook.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/spinctrl.h>
|
||||
|
||||
#include "UDPWiimote.h"
|
||||
|
||||
class UDPWrapper : public ControllerEmu::ControlGroup
|
||||
{
|
||||
@ -22,7 +31,8 @@ public:
|
||||
virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
|
||||
virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
|
||||
void Refresh();
|
||||
void Configure(wxWindow * parent); virtual ~UDPWrapper();
|
||||
void Configure(wxWindow * parent);
|
||||
virtual ~UDPWrapper();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -16,7 +16,6 @@
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "ConfigDiag.h"
|
||||
#include "UDPWrapper.h"
|
||||
|
||||
#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
|
||||
#define WXSTR_FROM_STR(s) (wxString::From8BitData((s).c_str()))
|
||||
|
@ -43,8 +43,7 @@
|
||||
#include "ControllerEmu.h"
|
||||
#include "InputConfig.h"
|
||||
#include "FileSearch.h"
|
||||
|
||||
class UDPWrapper;
|
||||
#include "UDPWrapper.h"
|
||||
|
||||
class PadSetting
|
||||
{
|
||||
@ -152,8 +151,9 @@ class UDPConfigButton : public wxButton
|
||||
{
|
||||
public:
|
||||
UDPWrapper * wrapper;
|
||||
UDPConfigButton( wxWindow* const parent, UDPWrapper * udp) : wrapper(udp),
|
||||
wxButton( parent, -1, wxT("Configure"), wxDefaultPosition )
|
||||
UDPConfigButton( wxWindow* const parent, UDPWrapper * udp) :
|
||||
wxButton( parent, -1, wxT("Configure"), wxDefaultPosition ),
|
||||
wrapper(udp)
|
||||
{}
|
||||
};
|
||||
|
||||
|
@ -28,7 +28,7 @@ if wmenv['HAVE_WX']:
|
||||
"FillReport.cpp",
|
||||
]
|
||||
|
||||
libs = [ 'common', 'inputcommon', 'inputuicommon', 'SDL' ]
|
||||
libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ]
|
||||
|
||||
cxxflags = [ ]
|
||||
|
||||
|
@ -21,7 +21,7 @@ files = [
|
||||
'WiimoteConfigDiag.cpp',
|
||||
]
|
||||
|
||||
libs = [ 'inputcommon', 'inputuicommon', 'common', 'SDL' ]
|
||||
libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ]
|
||||
|
||||
cxxflags = [ ]
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user