diff options
| author | nakeee <nakeee@gmail.com> | 2008-11-03 16:36:50 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-11-03 16:36:50 +0000 |
| commit | caa9a0bf2b9638661d0cb81058431863728ef5df (patch) | |
| tree | ad30dc92986ecc777672eca25e50101e8b8bc2a8 /Source/Core | |
| parent | f274a86de83e9ef6a4d88a841bb27ed106a30762 (diff) | |
compile on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1061 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/CommandProcessor.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/FilesystemViewer.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/MemcardManager.cpp | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Source/Core/Core/Src/HW/CommandProcessor.cpp b/Source/Core/Core/Src/HW/CommandProcessor.cpp index 5113600192..b3c7ae2738 100644 --- a/Source/Core/Core/Src/HW/CommandProcessor.cpp +++ b/Source/Core/Core/Src/HW/CommandProcessor.cpp @@ -451,7 +451,11 @@ void Write16(const u16 _Value, const u32 _Address) 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);
_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);
+#else
+ Common::InterlockedExchange((int*)&fifo.CPReadWriteDistance, 0);
+#endif
break;
}
diff --git a/Source/Core/DolphinWX/Src/FilesystemViewer.cpp b/Source/Core/DolphinWX/Src/FilesystemViewer.cpp index 3a3984bf79..3e151aabf2 100644 --- a/Source/Core/DolphinWX/Src/FilesystemViewer.cpp +++ b/Source/Core/DolphinWX/Src/FilesystemViewer.cpp @@ -49,7 +49,7 @@ CFilesystemViewer::CFilesystemViewer(const std::string fileName, wxWindow* paren fileIter beginning = Our_Files.begin(), end = Our_Files.end(),
pos = Our_Files.begin();
- CreateDirectoryTree(RootId, beginning, end, pos, "\\");
+ CreateDirectoryTree(RootId, beginning, end, pos, (char *)"\\");
m_Treectrl->Expand(RootId);
@@ -270,7 +270,7 @@ void CFilesystemViewer::OnBannerImageSave(wxCommandEvent& event) {
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);
if (dialog.ShowModal() == wxID_OK)
{
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index f8f9e096ec..3cc8d391cd 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -245,12 +245,12 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) _T("Gamecube save files(*.gci,*.gcs,*.sav)|*.gci;*.gcs;*.sav|"
"Native GCI files (*.gci)|*.gci|"
"MadCatz Gameshark files(*.gcs)|*.gcs|"
- "Datel MaxDrive/Pro files(*.sav)|*.sav|",
- "All files (%s)|%s"),
+ "Datel MaxDrive/Pro files(*.sav)|*.sav|"),
+ _T("All files (%s)|%s"),
wxFileSelectorDefaultWildcardStr,
wxFileSelectorDefaultWildcardStr
- ),
- wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+ ),
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
const char * fileName = temp.ToAscii();
if (!fileName2.empty() && !temp.empty())
{
|