diff options
| author | 2014-05-18 22:39:40 -0400 | |
|---|---|---|
| committer | 2014-05-18 22:39:40 -0400 | |
| commit | 9592d61037d05dc53b454644671a441788996208 (patch) | |
| tree | 8d353a62d9b5c14a8d58125dedda316fdf130fec /src | |
| parent | updated how we call ARM core to make things much faster (diff) | |
| parent | Fixed indents (diff) | |
| download | yuzu-9592d61037d05dc53b454644671a441788996208.tar.gz yuzu-9592d61037d05dc53b454644671a441788996208.tar.xz yuzu-9592d61037d05dc53b454644671a441788996208.zip | |
Merge pull request #13 from archshift/master
Use runtime arguments to specify boot filename.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/citra.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 6f3bc6f84..5a8642d1b 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -24,7 +24,14 @@ int __cdecl main(int argc, char **argv) { | |||
| 24 | 24 | ||
| 25 | System::Init(emu_window); | 25 | System::Init(emu_window); |
| 26 | 26 | ||
| 27 | std::string boot_filename = "homebrew.elf"; | 27 | std::string boot_filename; |
| 28 | |||
| 29 | if (argc < 2) { | ||
| 30 | ERROR_LOG(BOOT, "Failed to load ROM: No ROM specified"); | ||
| 31 | } | ||
| 32 | else { | ||
| 33 | boot_filename = argv[1]; | ||
| 34 | } | ||
| 28 | std::string error_str; | 35 | std::string error_str; |
| 29 | 36 | ||
| 30 | bool res = Loader::LoadFile(boot_filename, &error_str); | 37 | bool res = Loader::LoadFile(boot_filename, &error_str); |