ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4697 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-12-15 14:40:03 +00:00
parent 9c930f0825
commit 5a417fe76c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DebuggerWX/Src/MemoryWindow.cpp
View File

@ -360,7 +360,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event){
//sprintf(tmpstr,"%s%s",tmpstr,rawData.c_str()); //sprintf(tmpstr,"%s%s",tmpstr,rawData.c_str());
//strcpy(&tmpstr[1],rawData.ToAscii()); //strcpy(&tmpstr[1],rawData.ToAscii());
//memcpy(&tmpstr[1],&rawData.c_str()[0],rawData.size()); //memcpy(&tmpstr[1],&rawData.c_str()[0],rawData.size());
sprintf(tmpstr,"%s%s",tmpstr,rawData.To8BitData()); sprintf(tmpstr,"%s%s",tmpstr,(const char *)rawData.mb_str());
tmp2=&Dest.front(); tmp2=&Dest.front();
count=0; count=0;
for(i=0;i<strlen(tmpstr);i++){ for(i=0;i<strlen(tmpstr);i++){
@ -382,7 +382,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event){
tmp2=&Dest.front(); tmp2=&Dest.front();
sprintf(tmpstr,"%s",rawData.To8BitData()); sprintf(tmpstr,"%s",(const char *)rawData.mb_str());
for(i=0;i<size;i++){ for(i=0;i<size;i++){
tmp2[i]=tmpstr[i]; tmp2[i]=tmpstr[i];
} }
@ -442,4 +442,4 @@ void CMemoryWindow::onHex(wxCommandEvent& event){
chkAscii->SetValue(0); chkAscii->SetValue(0);
} }

7
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -10,21 +10,20 @@ files = [
"Config.cpp", "Config.cpp",
"DataReports.cpp", "DataReports.cpp",
"EmuDefinitions.cpp", "EmuDefinitions.cpp",
"EmuDynamics.cpp", "EmuDynamics.cpp",
"EmuMain.cpp", "EmuMain.cpp",
"EmuPad.cpp", "EmuPad.cpp",
"EmuSubroutines.cpp", "EmuSubroutines.cpp",
"Encryption.cpp", "Encryption.cpp",
"FakeAccelerometer.cpp",
"main.cpp", "main.cpp",
"Rumble.cpp", "Rumble.cpp",
] ]
if wmenv['HAVE_WX']: if wmenv['HAVE_WX']:
files += [ files += [
"ConfigBasicDlg.cpp", "ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp", "ConfigPadDlg.cpp",
"ConfigRecordingDlg.cpp", "ConfigRecordingDlg.cpp",
"ConfigGamepad.cpp", "ConfigGamepad.cpp",
"ConfigRecording.cpp", "ConfigRecording.cpp",
"FillReport.cpp", "FillReport.cpp",
] ]