diff options
Diffstat (limited to 'src/citra/citra.cpp')
| -rw-r--r-- | src/citra/citra.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 7dc721dc3..46781defa 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -4,12 +4,12 @@ | |||
| 4 | 4 | ||
| 5 | #include "common/common.h" | 5 | #include "common/common.h" |
| 6 | #include "common/log_manager.h" | 6 | #include "common/log_manager.h" |
| 7 | #include "common/file_util.h" | ||
| 8 | 7 | ||
| 9 | #include "core/system.h" | 8 | #include "core/system.h" |
| 10 | #include "core/core.h" | 9 | #include "core/core.h" |
| 11 | #include "core/loader/loader.h" | 10 | #include "core/loader/loader.h" |
| 12 | 11 | ||
| 12 | #include "citra/config.h" | ||
| 13 | #include "citra/emu_window/emu_window_glfw.h" | 13 | #include "citra/emu_window/emu_window_glfw.h" |
| 14 | 14 | ||
| 15 | /// Application entry point | 15 | /// Application entry point |
| @@ -21,13 +21,16 @@ int __cdecl main(int argc, char **argv) { | |||
| 21 | return -1; | 21 | return -1; |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | Config config; | ||
| 25 | |||
| 24 | std::string boot_filename = argv[1]; | 26 | std::string boot_filename = argv[1]; |
| 25 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; | 27 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; |
| 26 | 28 | ||
| 27 | System::Init(emu_window); | 29 | System::Init(emu_window); |
| 28 | 30 | ||
| 29 | if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) { | 31 | Loader::ResultStatus load_result = Loader::LoadFile(boot_filename); |
| 30 | ERROR_LOG(BOOT, "Failed to load ROM!"); | 32 | if (Loader::ResultStatus::Success != load_result) { |
| 33 | ERROR_LOG(BOOT, "Failed to load ROM (Error %i)!", load_result); | ||
| 31 | return -1; | 34 | return -1; |
| 32 | } | 35 | } |
| 33 | 36 | ||