diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-17 17:59:18 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-17 17:59:18 +0200 |
commit | 265c770a9d663b96a9a422201bac3dd454fa95c0 (patch) | |
tree | e7a1682450b857d80cc2ed0f863f4a82b81142bd /src/citra | |
parent | Merge pull request #17 from bunnei/arm-vfp (diff) | |
download | yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.tar yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.tar.gz yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.tar.bz2 yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.tar.lz yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.tar.xz yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.tar.zst yuzu-265c770a9d663b96a9a422201bac3dd454fa95c0.zip |
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/citra.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index d55b97393..6f3bc6f84 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -18,26 +18,24 @@ int __cdecl main(int argc, char **argv) { std::string program_dir = File::GetCurrentDir(); - LogManager::Init(); + LogManager::Init(); EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; - System::Init(emu_window); + System::Init(emu_window); std::string boot_filename = "homebrew.elf"; std::string error_str; - + bool res = Loader::LoadFile(boot_filename, &error_str); if (!res) { ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str()); } - for (;;) { - Core::SingleStep(); - } + Core::RunLoop(); delete emu_window; - return 0; + return 0; } |