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

Allow use of Logger window without entire debug suite via the -l command line option, make the options actually viewable in the logger and a very little bit of a cleanup in nJoy Test

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1633 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-12-23 08:49:52 +00:00
parent 62fff80925
commit 2852d1b84f
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -39,6 +39,7 @@
#include "Frame.h"
#include "Config.h"
#include "CodeWindow.h"
#include "LogWindow.h"
#include "ExtendedTrace.h"
#include "BootManager.h"
@ -120,6 +121,7 @@ bool DolphinApp::OnInit()
// ============
// Check for debugger
bool UseDebugger = false;
bool UseLogger = false;
bool LoadElf = false; wxString ElfFile;
#if wxUSE_CMDLINE_PARSER
@ -132,6 +134,9 @@ bool DolphinApp::OnInit()
{
wxCMD_LINE_SWITCH, _T("d"), _T("debugger"), _T("Opens the debugger")
},
{
wxCMD_LINE_SWITCH, _T("l"), _T("logger"), _T("Opens The Logger")
},
{
wxCMD_LINE_OPTION, _T("e"), _T("elf"), _T("Loads an elf file"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
@ -179,6 +184,7 @@ bool DolphinApp::OnInit()
}
UseDebugger = parser.Found(_T("debugger"));
UseLogger = parser.Found(_T("logger"));
LoadElf = parser.Found(_T("elf"), &ElfFile);
if( LoadElf && ElfFile == wxEmptyString )
@ -229,6 +235,15 @@ bool DolphinApp::OnInit()
g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, main_frame);
g_pCodeWindow->Show(true);
}
if(!UseDebugger && UseLogger)
{
#ifdef LOGGING
// We aren't using debugger, just logger
// Should be fine for a local copy
CLogWindow* m_LogWindow = new CLogWindow(main_frame);
m_LogWindow->Show(true);
#endif
}
// First check if we have a elf command line
if (LoadElf && ElfFile != wxEmptyString)