core: Consolidate core and system state, remove system module & cleanups.

2016-12-15 19:01:48 -05:00
parent 707cc66362
commit 232ef55c1a
22 changed files with 278 additions and 330 deletions
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -33,7 +33,6 @@
 #include "core/gdbstub/gdbstub.h"
 #include "core/loader/loader.h"
 #include "core/settings.h"
-#include "core/system.h"
 #include "video_core/video_core.h"

 static void PrintHelp(const char* argv0) {
@@ -145,7 +144,7 @@ int main(int argc, char** argv) {
    }

    while (emu_window->IsOpen()) {
-        Core::RunLoop();
+        system.RunLoop();
    }

    return 0;