mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-10-08 16:43:25 +00:00
Rename the /e command line option to exec. Caused some confusion in Issue 2891 since it is not limited to ELF only.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5823 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
0bf3dfda03
commit
2a3aa881fd
@ -92,12 +92,12 @@ bool DolphinApp::OnInit()
|
|||||||
// Declarations and definitions
|
// Declarations and definitions
|
||||||
bool UseDebugger = false;
|
bool UseDebugger = false;
|
||||||
bool UseLogger = false;
|
bool UseLogger = false;
|
||||||
bool LoadElf = false;
|
bool LoadFile = false;
|
||||||
bool selectVideoPlugin = false;
|
bool selectVideoPlugin = false;
|
||||||
bool selectAudioPlugin = false;
|
bool selectAudioPlugin = false;
|
||||||
bool selectWiimotePlugin = false;
|
bool selectWiimotePlugin = false;
|
||||||
|
|
||||||
wxString ElfFile;
|
wxString FileToLoad;
|
||||||
wxString videoPluginFilename;
|
wxString videoPluginFilename;
|
||||||
wxString audioPluginFilename;
|
wxString audioPluginFilename;
|
||||||
wxString wiimotePluginFilename;
|
wxString wiimotePluginFilename;
|
||||||
@ -117,7 +117,7 @@ bool DolphinApp::OnInit()
|
|||||||
wxCMD_LINE_SWITCH, "l", "logger", "Opens The Logger"
|
wxCMD_LINE_SWITCH, "l", "logger", "Opens The Logger"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
wxCMD_LINE_OPTION, "e", "elf", "Loads an elf file",
|
wxCMD_LINE_OPTION, "e", "exec", "Loads the specified file (DOL, ELF, WAD, GCM, ISO)",
|
||||||
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
|
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -155,7 +155,7 @@ bool DolphinApp::OnInit()
|
|||||||
wxCMD_LINE_SWITCH, _("l"), _("logger"), wxT("Opens The Logger")
|
wxCMD_LINE_SWITCH, _("l"), _("logger"), wxT("Opens The Logger")
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
wxCMD_LINE_OPTION, _("e"), _("elf"), wxT("Loads an elf file"),
|
wxCMD_LINE_OPTION, _("e"), _("exec"), wxT("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"),
|
||||||
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
|
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -189,11 +189,11 @@ bool DolphinApp::OnInit()
|
|||||||
#if wxCHECK_VERSION(2, 9, 0)
|
#if wxCHECK_VERSION(2, 9, 0)
|
||||||
UseDebugger = parser.Found("debugger");
|
UseDebugger = parser.Found("debugger");
|
||||||
UseLogger = parser.Found("logger");
|
UseLogger = parser.Found("logger");
|
||||||
LoadElf = parser.Found("elf", &ElfFile);
|
LoadFile = parser.Found("exec", &FileToLoad);
|
||||||
#else
|
#else
|
||||||
UseDebugger = parser.Found(wxT("debugger"));
|
UseDebugger = parser.Found(wxT("debugger"));
|
||||||
UseLogger = parser.Found(wxT("logger"));
|
UseLogger = parser.Found(wxT("logger"));
|
||||||
LoadElf = parser.Found(wxT("elf"), &ElfFile);
|
LoadFile = parser.Found(wxT("exec"), &FileToLoad);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxCHECK_VERSION(2, 9, 0)
|
#if wxCHECK_VERSION(2, 9, 0)
|
||||||
@ -389,10 +389,10 @@ bool DolphinApp::OnInit()
|
|||||||
// ------------
|
// ------------
|
||||||
// Check the autoboot options.
|
// Check the autoboot options.
|
||||||
|
|
||||||
// First check if we have an elf command line.
|
// First check if we have an exec command line.
|
||||||
if (LoadElf && ElfFile != wxEmptyString)
|
if (LoadFile && FileToLoad != wxEmptyString)
|
||||||
{
|
{
|
||||||
main_frame->BootGame(std::string(ElfFile.mb_str()));
|
main_frame->BootGame(std::string(FileToLoad.mb_str()));
|
||||||
}
|
}
|
||||||
// If we have selected Automatic Start, start the default ISO, or if no default
|
// If we have selected Automatic Start, start the default ISO, or if no default
|
||||||
// ISO exists, start the last loaded ISO
|
// ISO exists, start the last loaded ISO
|
||||||
|
Loading…
Reference in New Issue
Block a user