From 9ec81d4bf0236be19c4b59f8fe09c601827af173 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sun, 22 Feb 2009 21:37:36 +0000 Subject: [PATCH] linux compile fixes git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2377 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 3 --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 16 ++++++++-------- .../Plugin_VideoOGL/Src/OnScreenDisplay.cpp | 3 ++- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/SConstruct b/SConstruct index 28fafa39f1..dd6795c153 100644 --- a/SConstruct +++ b/SConstruct @@ -148,8 +148,6 @@ if not env['verbose']: env['SHLINKCOMSTR'] = "Linking shared $TARGET" env['RANLIBCOMSTR'] = "Indexing $TARGET" - - # build falvuor flavour = ARGUMENTS.get('flavor') if (flavour == 'debug'): @@ -267,7 +265,6 @@ conf.Define('USE_WX', env['USE_WX']) conf.Define('HAVE_X11', env['HAVE_X11']) conf.Define('HAVE_COCOA', env['HAVE_COCOA']) - # profile env['USE_OPROFILE'] = 0 if (flavour == 'prof'): diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index e1e22b29f3..b4eac93770 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -550,8 +550,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) case ID_SAVEIMPORT_B: { wxString temp = wxFileSelector(_T("Select a save file to import"), - (strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0) ? wxEmptyString : - wxString::FromAscii(DefaultIOPath.c_str()), wxEmptyString, wxEmptyString, wxString::Format + (strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0) ? wxString::FromAscii(""): wxString::FromAscii(DefaultIOPath.c_str()), wxEmptyString, wxEmptyString, wxString::Format ( _T("Gamecube save files(*.gci,*.gcs,*.sav)|*.gci;*.gcs;*.sav|" "Native GCI files (*.gci)|*.gci|" @@ -591,7 +590,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) memoryCard[slot]->DEntry_GameCode(index,tempC); memoryCard[slot]->DEntry_FileName(index,tempC2); sprintf(tempC, "%s_%s.gci", tempC, tempC2); - wxString temp = wxFileSelector(_T("Save GCI as.."), _T(DefaultIOPath.c_str()), + wxString temp = wxFileSelector(_T("Save GCI as.."), wxString::FromAscii(DefaultIOPath.c_str()), wxString::FromAscii(tempC), _T(".gci"), wxString::Format ( _T("GCI File(*.gci)|*.gci"), @@ -614,8 +613,9 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) slot=SLOT_A; case ID_EXPORTALL_B: { - std::string path1, path2; - SplitPath(m_MemcardPath[slot]->GetPath().mb_str(), &path1, &path2, NULL); + std::string path1, path2, mpath; + mpath = m_MemcardPath[slot]->GetPath().mb_str(); + SplitPath(mpath, &path1, &path2, NULL); path1 += path2; File::CreateDir(path1.c_str()); if(PanicYesNo("Warning: This will overwrite any existing saves " @@ -623,7 +623,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) " as a file on your memcard\nContinue?", path1.c_str())) for (int i = 0; i < DIRLEN; i++) { - CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, _("."), &path1), -1); + CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, ".", &path1), -1); } break; } @@ -853,7 +853,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); int slot = event.GetId() - ID_MEMCARDLIST_A; - popupMenu.Append(ID_COPYFROM_A + slot, wxString::Format("Copy to Memcard %c", 'B' - slot)); + popupMenu.Append(ID_COPYFROM_A + slot, wxString::Format(wxT("Copy to Memcard %c"), 'B' - slot)); popupMenu.Append(ID_DELETE_A + slot, wxT("Delete Save")); popupMenu.Append(ID_SAVEIMPORT_A + slot, wxT("Import Save")); popupMenu.Append(ID_SAVEEXPORT_A + slot, wxT("Export Save")); @@ -867,7 +867,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) popupMenu.Append(ID_FIXCHECKSUM_A + slot, wxT("Fix Checksums")); popupMenu.Append(ID_PREVPAGE_A + slot, wxT("Previous Page")); popupMenu.Append(ID_NEXTPAGE_A + slot, wxT("Next Page")); - popupMenu.Append(ID_MEMCARDPATH_A + slot, wxString::Format("Set as default Memcard %c", 'A' + slot)); + popupMenu.Append(ID_MEMCARDPATH_A + slot, wxString::Format(wxT("Set as default Memcard %c"), 'A' + slot)); popupMenu.AppendCheckItem(ID_USEPAGES, wxT("Enable pages")); if (!prevPage || !usePages) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.cpp index 09d99d7c28..2c89fd47d8 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.cpp @@ -22,6 +22,7 @@ #include "OnScreenDisplay.h" #include "Render.h" +#include "Timer.h" namespace OSD { @@ -83,4 +84,4 @@ void DrawMessages() glDisable(GL_BLEND); } -} // namespace \ No newline at end of file +} // namespace diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h index 44f5e383da..0ac834989b 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h @@ -170,4 +170,4 @@ namespace Recording //////////////////////////////// -#endif __NJOY_h__ \ No newline at end of file +#endif // __NJOY_h__