aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2014-05-18 22:39:40 -0400
committerGravatar bunnei <bunneidev@gmail.com>2014-05-18 22:39:40 -0400
commit9592d61037d05dc53b454644671a441788996208 (patch)
tree8d353a62d9b5c14a8d58125dedda316fdf130fec /src/citra/citra.cpp
parent265c770a9d663b96a9a422201bac3dd454fa95c0 (diff)
parentbd316ca0c0e244baf8f77b635eae85f744a62cf1 (diff)
Merge pull request #13 from archshift/master
Use runtime arguments to specify boot filename.
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 6f3bc6f8..5a8642d1 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -24,7 +24,14 @@ int __cdecl main(int argc, char **argv) {
System::Init(emu_window);
- std::string boot_filename = "homebrew.elf";
+ std::string boot_filename;
+
+ if (argc < 2) {
+ ERROR_LOG(BOOT, "Failed to load ROM: No ROM specified");
+ }
+ else {
+ boot_filename = argv[1];
+ }
std::string error_str;
bool res = Loader::LoadFile(boot_filename, &error_str);