diff options
author | bunnei <ericbunnie@gmail.com> | 2014-06-18 18:58:09 -0400 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-06-24 19:29:58 -0400 |
commit | 7889cafc76ac99b8509fa3cd1558a09f8a7e5f91 (patch) | |
tree | e6ffea9ec1c334bfca13404c47a2191fd281554c /src/citra/citra.cpp | |
parent | 79a48082e2c7b6e61f38b442a66147a4e46f2911 (diff) |
Loader: Implemented AppLoader interface for abstracting application loading.
- Various cleanups/refactorings to Loader, ELF, and NCCH modules.
- Added AppLoader interface to ELF and NCCH.
- Updated Qt/GLFW frontends to check AppLoader ResultStatus.
NCCH: Removed extra qualification typos.
Loader: Removed unnecessary #include's.
NCCH: Improved readability of memcmp statements.
NCCH: Added missing space.
Elf: Removed unnecessary usage of unique_ptr.
Loader: Removed unnecessary usage of unique_ptr.
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r-- | src/citra/citra.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index f6bb10f2..036af373 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -16,28 +16,21 @@ /// Application entry point int __cdecl main(int argc, char **argv) { - std::string program_dir = File::GetCurrentDir(); - LogManager::Init(); - EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; - - System::Init(emu_window); - - std::string boot_filename; - if (argc < 2) { ERROR_LOG(BOOT, "Failed to load ROM: No ROM specified"); + return -1; } - else { - boot_filename = argv[1]; - } - std::string error_str; - bool res = Loader::LoadFile(boot_filename, &error_str); + std::string boot_filename = argv[1]; + EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; + + System::Init(emu_window); - if (!res) { - ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str()); + if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) { + ERROR_LOG(BOOT, "Failed to load ROM!"); + return -1; } Core::RunLoop(); |