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

Migration to the new dir struct (in code only!, no deletion of old dirs...yet). VS projects copy Data/* to Binary/<arch>. Added SConscript to some projects where it was missing. This is the time to move over all your files!

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1140 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-11-12 04:54:17 +00:00
parent 8c7d7a6c36
commit f7cb34f1e0
30 changed files with 218 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
View File

@ -226,7 +226,7 @@ CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event)
{
// load ini
IniFile ini;
std::string filename = std::string("GameIni/BreakPoints.ini");
std::string filename = std::string(FULL_GAMECONFIG_DIR "BreakPoints.ini");
if (ini.Load(filename.c_str())) // check if there is any file there
{
@ -275,7 +275,7 @@ CBreakPointWindow::OnAddMemoryCheckMany(wxCommandEvent& event)
{
// load ini
IniFile ini;
std::string filename = std::string("GameIni/MemoryChecks.ini");
std::string filename = std::string(FULL_GAMECONFIG_DIR "MemoryChecks.ini");
if (ini.Load(filename.c_str()))
{
@ -354,7 +354,7 @@ CBreakPointWindow::OnAddMemoryCheckMany(wxCommandEvent& event)
}
else
{
wxMessageBox(_T("You have no GameIni/MemoryChecks.ini file"));
wxMessageBox(_T("You have no " FULL_GAMECONFIG_DIR "MemoryChecks.ini file"));
}
}
// =================

40
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -160,7 +160,7 @@ CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter
// load ini...
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Load(file);
if (m_BreakpointWindow) m_BreakpointWindow->Load(file);
@ -175,7 +175,7 @@ CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter
CCodeWindow::~CCodeWindow()
{
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Save(file);
if (m_BreakpointWindow) m_BreakpointWindow->Save(file);
@ -184,7 +184,7 @@ CCodeWindow::~CCodeWindow()
if (m_MemoryWindow) m_MemoryWindow->Save(file);
if (m_JitWindow) m_JitWindow->Save(file);
file.Save("Debugger.ini");
file.Save(DEBUGGER_CONFIG_FILE);
}
@ -224,7 +224,7 @@ void CCodeWindow::CreateGUIControls(const SCoreStartupParameter& _LocalCoreStart
// Decide what windows to use
// --------------
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Get("ShowOnStart", "LogWindow", &bLogWindow, true);
ini.Get("ShowOnStart", "RegisterWindow", &bRegisterWindow, true);
@ -547,7 +547,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
{
PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_symbolDB);
SignatureDB db;
if (db.Load("data/totaldb.dsy"))
if (db.Load(TOTALDB_FILE))
db.Apply(&g_symbolDB);
// HLE::PatchFunctions();
@ -560,7 +560,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
g_symbolDB.Clear();
PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_symbolDB);
SignatureDB db;
if (db.Load("data/totaldb.dsy"))
if (db.Load(TOTALDB_FILE))
db.Apply(&g_symbolDB);
} else {
g_symbolDB.LoadMap(mapfile.c_str());
@ -859,9 +859,9 @@ void CCodeWindow::OnToggleLogWindow(wxCommandEvent& event)
// this may be a little ugly to have these here - you're more than welcome to
// turn this into the same fancy class stuff like the load windows positions
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "LogWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{
@ -894,9 +894,9 @@ void CCodeWindow::OnToggleRegisterWindow(wxCommandEvent& event)
bool show = GetMenuBar()->IsChecked(event.GetId());
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "RegisterWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{
@ -931,9 +931,9 @@ void CCodeWindow::OnToggleSoundWindow(wxCommandEvent& event)
bool show = GetMenuBar()->IsChecked(event.GetId());
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "SoundWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{
@ -959,9 +959,9 @@ void CCodeWindow::OnToggleVideoWindow(wxCommandEvent& event)
bool show = GetMenuBar()->IsChecked(event.GetId());
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "VideoWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{
@ -984,9 +984,9 @@ void CCodeWindow::OnToggleJitWindow(wxCommandEvent& event)
bool show = GetMenuBar()->IsChecked(event.GetId());
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "JitWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{
@ -1018,9 +1018,9 @@ void CCodeWindow::OnToggleBreakPointWindow(wxCommandEvent& event)
bool show = GetMenuBar()->IsChecked(event.GetId());
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "BreakpointWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{
@ -1051,9 +1051,9 @@ void CCodeWindow::OnToggleMemoryWindow(wxCommandEvent& event)
bool show = GetMenuBar()->IsChecked(event.GetId());
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("ShowOnStart", "MemoryWindow", show);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (show)
{

18
Source/Core/DebuggerWX/Src/LogWindow.cpp
View File

@ -177,7 +177,7 @@ void CLogWindow::OnEnableAll(wxCommandEvent& event)
static bool enable = true;
int v = LogManager::m_LogSettings->m_iVerbosity;
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{
m_checks->Check(i, enable);
@ -185,7 +185,7 @@ void CLogWindow::OnEnableAll(wxCommandEvent& event)
LogManager::m_Log[i + v*100]->m_bShowInLog = enable;
ini.Set("LogManager", LogManager::m_Log[i + v*100]->m_szShortName, enable);
}
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
enable = !enable;
}
@ -220,7 +220,7 @@ void CLogWindow::UpdateChecks()
// -------------
int v = LogManager::m_LogSettings->m_iVerbosity;
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{
@ -244,12 +244,12 @@ void CLogWindow::UpdateChecks()
void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
{
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
LogManager::m_LogSettings->bResolve = m_options->IsChecked(0);
LogManager::m_LogSettings->bWriteMaster = m_options->IsChecked(1);
ini.Set("LogWindow", "ResolveSymbols", m_options->IsChecked(0));
ini.Set("LogWindow", "WriteMaster", m_options->IsChecked(1));
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
if (Core::GetState() != Core::CORE_UNINITIALIZED) UpdateLog();
}
@ -265,7 +265,7 @@ void CLogWindow::OnLogCheck(wxCommandEvent& event)
}
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
int v = LogManager::m_LogSettings->m_iVerbosity;
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
@ -278,7 +278,7 @@ void CLogWindow::OnLogCheck(wxCommandEvent& event)
ini.Set("LogManager", LogManager::m_Log[i + 100*v]->m_szShortName, Enabled);
}
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
m_bCheckDirty = true;
if (Core::GetState() != Core::CORE_UNINITIALIZED) UpdateLog();
@ -296,9 +296,9 @@ void CLogWindow::OnRadioChange(wxCommandEvent& event)
// save it
LogManager::m_LogSettings->m_iVerbosity = v;
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Set("LogWindow", "Verbosity", v);
ini.Save("Debugger.ini");
ini.Save(DEBUGGER_CONFIG_FILE);
// This check is because we allow this to be changed before a game has been loaded so
// that the boxes do not exist yet