piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 17:49:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix ups for people running Linux. If it breaks anything, punch me in the face.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@30 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-07-20 11:02:41 +00:00
parent 35950043a6
commit c7795c41b7
36 changed files with 140 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
#include "VolumeCreator.h"
#include "Config.h"
#include "Core.h"
#include "frame.h"
#include "Frame.h"
#include "CodeWindow.h"
static std::string s_DataBasePath_EUR = "Data_EUR";

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

@ -194,14 +194,18 @@ CFrame::CreateMenu()
{
m_pMenuItemPlay = new wxMenuItem(pEmulationMenu, IDM_PLAY, _T("&Play"));
m_pMenuItemPlay->SetBitmap(m_BitmapsMenu[Toolbar_Play]);
m_pMenuItemPlay->SetDisabledBitmap(m_BitmapsMenu[Toolbar_Play_Dis]);
#ifdef WIN32
m_pMenuItemPlay->SetDisabledBitmap(m_BitmapsMenu[Toolbar_Play_Dis]); //Linux Doesn't have
#endif
pEmulationMenu->Append(m_pMenuItemPlay);
}
// stop
{
m_pMenuItemStop = new wxMenuItem(pEmulationMenu, IDM_STOP, _T("&Stop"));
m_pMenuItemStop->SetBitmap(m_BitmapsMenu[Toolbar_Stop]);
m_pMenuItemStop->SetDisabledBitmap(m_BitmapsMenu[Toolbar_Stop_Dis]);
#ifdef WIN32
m_pMenuItemStop->SetDisabledBitmap(m_BitmapsMenu[Toolbar_Stop_Dis]); //Linux doesn't have
#endif
pEmulationMenu->Append(m_pMenuItemStop);
}
pEmulationMenu->AppendSeparator();
@ -226,7 +230,9 @@ CFrame::CreateMenu()
{
m_pPluginOptions = pPluginMenu->Append(IDM_PLUGIN_OPTIONS, _T("&Choose Plugins..."));
m_pPluginOptions->SetBitmap(m_BitmapsMenu[Toolbar_PluginOptions]);
m_pPluginOptions->SetDisabledBitmap(m_BitmapsMenu[Toolbar_PluginOptions_Dis]);
#ifdef WIN32
m_pPluginOptions->SetDisabledBitmap(m_BitmapsMenu[Toolbar_PluginOptions_Dis]); //Linux doesn't have
#endif
}
pPluginMenu->AppendSeparator();
{
@ -362,8 +368,9 @@ CFrame::OnOpen(wxCommandEvent& WXUNUSED (event))
{
return;
}
BootManager::BootCore(path.c_str());
std::string temp;
temp.insert(0, path.ToAscii()); //Need to convert to C++ style string first
BootManager::BootCore(temp);
}
@ -403,7 +410,7 @@ CFrame::OnAbout(wxCommandEvent& WXUNUSED (event))
void
CFrame::OnHelp(wxCommandEvent& WXUNUSED (event))
{
wxMessageBox("missing OnHelp()");
wxMessageBox(wxString::FromAscii("missing OnHelp()"));
}
@ -516,7 +523,7 @@ CFrame::OnHostMessage(wxCommandEvent& event)
wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small
);*/
m_pBootProcessDialog = new wxBusyInfo("Booting...", this);
m_pBootProcessDialog = new wxBusyInfo(wxString::FromAscii("Booting..."), this);
}
break;

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

@ -83,7 +83,9 @@ CGameListCtrl::BrowseForDirectory()
if (dialog.ShowModal() == wxID_OK)
{
SConfig::GetInstance().m_ISOFolder.push_back(dialog.GetPath().c_str());
std::string temp;
temp.insert(0, dialog.GetPath().ToAscii()); //Manual conversion to C++ string
SConfig::GetInstance().m_ISOFolder.push_back(temp);
SConfig::GetInstance().SaveSettings();
Update();
}
@ -154,7 +156,9 @@ wxString NiceSizeFormat(s64 _size)
float f = (float)_size + ((float)frac / 1024.0f);
wxString NiceString;
NiceString.Printf("%3.1f %s", f, sizes[s]);
wxString tempstring;
tempstring = wxString::FromAscii("%3.1f %s"); // Gotta convert to wxString first or else it complains
NiceString.Printf(tempstring, f, sizes[s]);
return(NiceString);
}
@ -192,7 +196,7 @@ CGameListCtrl::InsertItemInReportView(size_t _Index)
wxListItem item;
item.SetId(ItemIndex);
item.SetColumn(COLUMN_TITLE);
item.SetText(rISOFile.GetName());
item.SetText(wxString::FromAscii(rISOFile.GetName().c_str()));
SetItem(item);
}
@ -201,7 +205,7 @@ CGameListCtrl::InsertItemInReportView(size_t _Index)
wxListItem item;
item.SetId(ItemIndex);
item.SetColumn(COLUMN_COMPANY);
item.SetText(rISOFile.GetCompany());
item.SetText(wxString::FromAscii(rISOFile.GetCompany().c_str()));
SetItem(item);
}
@ -276,7 +280,9 @@ CGameListCtrl::ScanForISOs()
SplitPath(rFilenames[i], NULL, &FileName, NULL);
wxString msg;
msg.Printf("Scanning %s", FileName.c_str());
wxString tempstring;
tempstring = wxString::FromAscii("Scanning %s");
msg.Printf(tempstring, FileName.c_str());
bool Cont = dialog.Update(i, msg);

1
Source/Core/DolphinWX/src/ISOFile.cpp
View File

@ -18,7 +18,6 @@
#include <string>
#include <vector>
#include "Common.h"
#include "Globals.h"
#include "ISOFile.h"

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

@ -111,7 +111,7 @@ void DolphinApp::OnEndSession()
bool wxPanicAlert(const char* text, bool /*yes_no*/)
{
wxMessageBox(text, _T("PANIC ALERT"));
wxMessageBox(wxString::FromAscii(text), _T("PANIC ALERT"));
return(true);
}
@ -234,7 +234,7 @@ void Host_CloseDisplay()
void Host_UpdateStatusBar(const char* _pText)
{
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATESTATUSBAR);
event.SetString(_pText);
event.SetString(wxString::FromAscii(_pText));
wxPostEvent(main_frame, event);
}

9
Source/Core/DolphinWX/src/PluginManager.cpp
View File

@ -18,7 +18,6 @@
#include <string>
#include <vector>
#include "Common.h"
#include "Globals.h"
#include "FileSearch.h"
#include "FileUtil.h"
@ -42,7 +41,9 @@ CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
m_PluginInfos.clear();
CFileSearch::XStringVector Directories;
Directories.push_back(_T("Plugins"));
std::string temp;
temp.insert(0, "Plugins");
Directories.push_back(temp);
CFileSearch::XStringVector Extensions;
#ifdef _WIN32
@ -83,7 +84,9 @@ CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
}
wxString msg;
msg.Printf("Scanning %s", FileName.c_str());
wxString temp;
temp = wxString::FromAscii("Scanning %s");
msg.Printf(temp, FileName.c_str());
bool Cont = dialog.Update((int)i, msg);
if (!Cont)

2
Source/Core/DolphinWX/src/PluginManager.h
View File

@ -18,7 +18,7 @@
#ifndef __PLUGIN_MANAGER_H_
#define __PLUGIN_MANAGER_H_
#include "plugin.h"
#include "Plugin.h"
class CPluginInfo
{

5
Source/Core/DolphinWX/src/PluginOptions.cpp
View File

@ -18,7 +18,6 @@
#include <string>
#include <vector>
#include "Common.h"
#include "Globals.h"
#include "PluginOptions.h"
@ -232,7 +231,9 @@ CPluginOptions::FillChoiceBox(wxChoice* _pChoice, int _PluginType, const std::st
if (rPluginInfo.Type == _PluginType)
{
int NewIndex = _pChoice->Append(rInfos[i].GetPluginInfo().Name, (void*)&rInfos[i]);
wxString temp;
temp = wxString::FromAscii(rInfos[i].GetPluginInfo().Name);
int NewIndex = _pChoice->Append(temp, (void*)&rInfos[i]);
if (rInfos[i].GetFileName() == _SelectFilename)
{

19
Source/Core/DolphinWX/src/SConscript Normal file
View File

@ -0,0 +1,19 @@
Import('env')
files = ["BootManager.cpp",
"Config.cpp",
"FileSearch.cpp",
"Frame.cpp",
"GameListCtrl.cpp",
"Globals.cpp",
"ISOFile.cpp",
"Main.cpp",
# "MainNoGUI.cpp",
"PluginManager.cpp",
"PluginOptions.cpp",
"stdafx.cpp",
]
wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags --debug` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP",
LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs --debug`")
wxenv.Program("../../../../Binary/linux/Dolphin", files, LIBS = ["debwx", "discio", "core", "bdisasm", "videocommon", "common"])