diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-02-02 21:56:29 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-02-02 21:56:29 +0000 |
| commit | feba09f7a3e8d8e9b1ea2fe0d666c5be82941096 (patch) | |
| tree | e695da77bfbd419355df9d29c799f6722d64ccef /Source/Core/DebuggerWX | |
| parent | a090876bbd89ac656db2c1a5b81b778311b1c804 (diff) | |
Linux global build. At least the basic footwork is done here.
Basic usage: "sudo scons install=global install"
Hopefully this doesn't break builds on Macs. I have tested this on linux and windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/BreakpointWindow.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/MemoryWindow.cpp | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp index f06ddfcde3..8198247038 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp @@ -23,7 +23,7 @@ #include "MemoryCheckDlg.h" #include "Host.h" #include "PowerPC/PowerPC.h" - +#include "FileUtil.h" BEGIN_EVENT_TABLE(CBreakPointWindow, wxPanel) EVT_CLOSE(CBreakPointWindow::OnClose) @@ -137,7 +137,7 @@ void CBreakPointWindow::OnAddBreakPointMany() { // load ini IniFile ini; - std::string filename = std::string(FULL_GAMECONFIG_DIR "BreakPoints.ini"); + std::string filename = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + "BreakPoints.ini"; if (ini.Load(filename.c_str())) // check if there is any file there { @@ -163,7 +163,7 @@ void CBreakPointWindow::OnAddBreakPointMany() } else { - wxMessageBox(_T("Couldn't find User/GameConfig/BreakPoints.ini file")); + wxMessageBox(_T("Couldn't find GameConfig/BreakPoints.ini file")); } } @@ -183,7 +183,7 @@ void CBreakPointWindow::OnAddMemoryCheckMany() { // load ini IniFile ini; - std::string filename = std::string(FULL_GAMECONFIG_DIR "MemoryChecks.ini"); + std::string filename = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + "MemoryChecks.ini"; if (ini.Load(filename.c_str())) { @@ -262,7 +262,7 @@ void CBreakPointWindow::OnAddMemoryCheckMany() } else { - wxMessageBox(_T("You have no ") T_FULL_GAMECONFIG_DIR _T("MemoryChecks.ini file")); + wxMessageBox(_T("You have no ") + wxString::FromAscii(File::GetUserPath(D_GAMECONFIG_IDX)) + _T("MemoryChecks.ini file")); } } diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 4588fdb05c..a4f8904fbe 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -84,7 +84,7 @@ extern "C" // Bitmaps void CCodeWindow::Load() { IniFile ini; - ini.Load(DEBUGGER_CONFIG_FILE); + ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)); // The font to override DebuggerFont with std::string fontDesc; @@ -133,7 +133,7 @@ void CCodeWindow::Load() void CCodeWindow::Save() { IniFile ini; - ini.Load(DEBUGGER_CONFIG_FILE); + ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)); ini.Set("ShowOnStart", "DebuggerFont", std::string(DebuggerFont.GetNativeFontInfoUserDesc().mb_str())); @@ -172,7 +172,7 @@ void CCodeWindow::Save() ini.Set("Float", "Sound", !!FindWindowById(IDM_SOUNDWINDOW_PARENT)); ini.Set("Float", "Video", !!FindWindowById(IDM_VIDEOWINDOW_PARENT)); - ini.Save(DEBUGGER_CONFIG_FILE); + ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX)); } diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp index 2d449d4e73..8e4db3e26d 100644 --- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp +++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp @@ -27,6 +27,7 @@ #include "HW/CPU.h" #include "PowerPC/PowerPC.h" #include "Host.h" +#include "FileUtil.h" #include "Debugger/PPCDebugInterface.h" #include "PowerPC/PPCSymbolDB.h" @@ -243,7 +244,7 @@ void CMemoryWindow::OnDumpMemory( wxCommandEvent& event ) case 0: default: { - FILE* pDumpFile = fopen(MAINRAM_DUMP_FILE, "wb"); + FILE* pDumpFile = fopen(File::GetUserPath(F_RAMDUMP_IDX), "wb"); if (pDumpFile) { if (Memory::m_pRAM) @@ -257,7 +258,7 @@ void CMemoryWindow::OnDumpMemory( wxCommandEvent& event ) case 1: { - FILE* pDumpFile = fopen(ARAM_DUMP_FILE, "wb"); + FILE* pDumpFile = fopen(File::GetUserPath(F_ARAMDUMP_IDX), "wb"); if (pDumpFile) { u8* aram = DSP::GetARAMPtr(); |
