piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fixes a few things, Should Compile in Linux. Ran Crazy Taxi horribly

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@38 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-07-21 01:27:13 +00:00
parent 36f8b9751a
commit c33cf08a2f
11 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/src/BootManager.cpp
View File

@ -56,7 +56,9 @@ bool BootCore(const std::string& _rFilename)
// StartUp.bUseDualCore = false;
StartUp.bUseDynarec = true;
}
#ifndef _WIN32
StartUp.bUseDynarec = false;//Never use Dynarec in Linux, crashes
#endif
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
StartUp.m_strFilename = _rFilename;
StartUp.bHLEBios = true;

2
Source/Core/DolphinWX/src/Frame.cpp
View File

@ -191,7 +191,7 @@ CFrame::CreateMenu()
{
wxMenu* pGameMenu = new wxMenu;
{
wxMenuItem *pItem = new wxMenuItem(pGameMenu, IDM_EDITPATCHFILE, "Edit patch file");
wxMenuItem *pItem = new wxMenuItem(pGameMenu, IDM_EDITPATCHFILE, wxString::FromAscii("Edit patch file"));
pGameMenu->Append(pItem);
}
}

4
Source/Core/DolphinWX/src/GameListCtrl.cpp
View File

@ -338,8 +338,8 @@ CGameListCtrl::OnRightClick(wxMouseEvent& event)
std::string unique_id = selected_iso->GetUniqueID();
wxMenu popupMenu;
std::string menu_text = StringFromFormat("Edit &patch file: %s.ini", unique_id.c_str());
popupMenu.Append(IDM_EDITPATCHFILE, menu_text);
popupMenu.Append(IDM_OPENCONTAININGFOLDER, "Open &containing folder");
popupMenu.Append(IDM_EDITPATCHFILE, wxString::FromAscii(menu_text.c_str())); //Pretty much everything in wxwidgets is a wxString, try to convert to those first!
popupMenu.Append(IDM_OPENCONTAININGFOLDER, wxString::FromAscii("Open &containing folder"));
PopupMenu(&popupMenu);
}
}

21
Source/Core/DolphinWX/src/Main.cpp
View File

@ -17,8 +17,9 @@
#include <vector>
#include <string>
#include "svnrev.h"
#ifdef WIN32
#include "svnrev.h"
#endif
#include "CPUDetect.h"
#include "Globals.h"
#include "Common.h"
@ -94,12 +95,20 @@ bool DolphinApp::OnInit()
SConfig::GetInstance().LoadSettings();
wxInitAllImageHandlers();
// Create the main frame window
#ifdef _DEBUG
const char *title = "Dolphin Debug SVN R " SVN_REV_STR;
#ifdef _WIN32
#ifdef _DEBUG
const char *title = "Dolphin Debug SVN R " SVN_REV_STR;
#else
const char *title = "Dolphin SVN R " SVN_REV_STR;
#endif
#else
const char *title = "Dolphin SVN R " SVN_REV_STR;
#ifdef _DEBUG
const char *title = "Dolphin Debug SVN Linux Build"; // Do this for now
#else
const char *title = "Dolphin SVN Linux Build";
#endif
#endif
main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, title,
main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, wxString::FromAscii(title),
wxPoint(100, 100), wxSize(800, 600));
// create debugger