diff options
author | archshift <admin@archshift.com> | 2014-09-12 17:06:13 -0700 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-10-07 15:09:37 -0700 |
commit | e6594f9f53df456db42ab2091a7b1397070ff9c8 (patch) | |
tree | a1ca13000e379f753a155580560c20e015c2e552 /src/citra/citra.cpp | |
parent | ee7cfc71bd8663b77a43c5ba577074972d9b7ad9 (diff) |
Added configuration file system.
Uses QSettings on citra-qt, and inih on citra-cli.
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 @@ #include "common/common.h" #include "common/log_manager.h" -#include "common/file_util.h" #include "core/system.h" #include "core/core.h" #include "core/loader/loader.h" +#include "citra/config.h" #include "citra/emu_window/emu_window_glfw.h" /// Application entry point @@ -21,13 +21,16 @@ int __cdecl main(int argc, char **argv) { return -1; } + Config config; + std::string boot_filename = argv[1]; EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; System::Init(emu_window); - if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) { - ERROR_LOG(BOOT, "Failed to load ROM!"); + Loader::ResultStatus load_result = Loader::LoadFile(boot_filename); + if (Loader::ResultStatus::Success != load_result) { + ERROR_LOG(BOOT, "Failed to load ROM (Error %i)!", load_result); return -1; } |