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

compile on linux 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1061 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-03 16:36:50 +00:00
parent f274a86de8
commit caa9a0bf2b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/HW/CommandProcessor.cpp
View File

@ -451,7 +451,11 @@ void Write16(const u16 _Value, const u32 _Address)
case FIFO_RW_DISTANCE_LO: case FIFO_RW_DISTANCE_LO:
LOG(COMMANDPROCESSOR,"try to write to %s : %04x",((_Address & 0xFFF) == FIFO_RW_DISTANCE_HI) ? "FIFO_RW_DISTANCE_HI" : "FIFO_RW_DISTANCE_LO", _Value); LOG(COMMANDPROCESSOR,"try to write to %s : %04x",((_Address & 0xFFF) == FIFO_RW_DISTANCE_HI) ? "FIFO_RW_DISTANCE_HI" : "FIFO_RW_DISTANCE_LO", _Value);
_dbg_assert_msg_(COMMANDPROCESSOR, _Value==0, "WTF? attempt to overwrite fifo CPReadWriteDistance with a value(%04x) != 0 ",_Value); _dbg_assert_msg_(COMMANDPROCESSOR, _Value==0, "WTF? attempt to overwrite fifo CPReadWriteDistance with a value(%04x) != 0 ",_Value);
#ifdef _WIN32
InterlockedExchange((LONG*)&fifo.CPReadWriteDistance, 0); InterlockedExchange((LONG*)&fifo.CPReadWriteDistance, 0);
#else
Common::InterlockedExchange((int*)&fifo.CPReadWriteDistance, 0);
#endif
break; break;
} }

4
Source/Core/DolphinWX/Src/FilesystemViewer.cpp
View File

@ -49,7 +49,7 @@ CFilesystemViewer::CFilesystemViewer(const std::string fileName, wxWindow* paren
fileIter beginning = Our_Files.begin(), end = Our_Files.end(), fileIter beginning = Our_Files.begin(), end = Our_Files.end(),
pos = Our_Files.begin(); pos = Our_Files.begin();
CreateDirectoryTree(RootId, beginning, end, pos, "\\"); CreateDirectoryTree(RootId, beginning, end, pos, (char *)"\\");
m_Treectrl->Expand(RootId); m_Treectrl->Expand(RootId);
@ -270,7 +270,7 @@ void CFilesystemViewer::OnBannerImageSave(wxCommandEvent& event)
{ {
wxString dirHome; wxString dirHome;
wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format("%s.png", m_GameID->GetLabel()), wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(_("%s.png"), m_GameID->GetLabel()),
_("*.*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize); _("*.*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize);
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)
{ {

8
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -245,12 +245,12 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
_T("Gamecube save files(*.gci,*.gcs,*.sav)|*.gci;*.gcs;*.sav|" _T("Gamecube save files(*.gci,*.gcs,*.sav)|*.gci;*.gcs;*.sav|"
"Native GCI files (*.gci)|*.gci|" "Native GCI files (*.gci)|*.gci|"
"MadCatz Gameshark files(*.gcs)|*.gcs|" "MadCatz Gameshark files(*.gcs)|*.gcs|"
"Datel MaxDrive/Pro files(*.sav)|*.sav|", "Datel MaxDrive/Pro files(*.sav)|*.sav|"),
"All files (%s)|%s"), _T("All files (%s)|%s"),
wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr,
wxFileSelectorDefaultWildcardStr wxFileSelectorDefaultWildcardStr
), ),
wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxFD_OPEN | wxFD_FILE_MUST_EXIST);
const char * fileName = temp.ToAscii(); const char * fileName = temp.ToAscii();
if (!fileName2.empty() && !temp.empty()) if (!fileName2.empty() && !temp.empty())
{ {