diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/system.cpp | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/system.cpp')
| -rw-r--r-- | src/core/system.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 4fc266cb0..7d54811a0 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp | |||
| @@ -3,21 +3,19 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "audio_core/audio_core.h" | 5 | #include "audio_core/audio_core.h" |
| 6 | |||
| 7 | #include "core/core.h" | 6 | #include "core/core.h" |
| 8 | #include "core/core_timing.h" | 7 | #include "core/core_timing.h" |
| 9 | #include "core/system.h" | ||
| 10 | #include "core/gdbstub/gdbstub.h" | 8 | #include "core/gdbstub/gdbstub.h" |
| 11 | #include "core/hw/hw.h" | ||
| 12 | #include "core/hle/hle.h" | 9 | #include "core/hle/hle.h" |
| 13 | #include "core/hle/kernel/kernel.h" | 10 | #include "core/hle/kernel/kernel.h" |
| 14 | #include "core/hle/kernel/memory.h" | 11 | #include "core/hle/kernel/memory.h" |
| 15 | 12 | #include "core/hw/hw.h" | |
| 13 | #include "core/system.h" | ||
| 16 | #include "video_core/video_core.h" | 14 | #include "video_core/video_core.h" |
| 17 | 15 | ||
| 18 | namespace System { | 16 | namespace System { |
| 19 | 17 | ||
| 20 | static bool is_powered_on{ false }; | 18 | static bool is_powered_on{false}; |
| 21 | 19 | ||
| 22 | Result Init(EmuWindow* emu_window) { | 20 | Result Init(EmuWindow* emu_window) { |
| 23 | Core::Init(); | 21 | Core::Init(); |