summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-20 17:21:23 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-21 04:15:47 +0200
commitebdae19fd226104baec712b9da9939ff82ef3c3a (patch)
treee046c0f562fc4400480b2e3257f140e973a9ce6a /src/citra
parentManually tweak source formatting and then re-run clang-format (diff)
downloadyuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.bz2
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.lz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.zst
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/citra.cpp7
-rw-r--r--src/citra/config.cpp10
-rw-r--r--src/citra/config.h1
-rw-r--r--src/citra/emu_window/emu_window_sdl2.cpp8
-rw-r--r--src/citra/emu_window/emu_window_sdl2.h1
5 files changed, 5 insertions, 22 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 1b8f8cffe..e47375f88 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -21,22 +21,19 @@
#include <Windows.h>
#endif
+#include "citra/config.h"
+#include "citra/emu_window/emu_window_sdl2.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/scope_exit.h"
#include "common/string_util.h"
-
#include "core/core.h"
#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
#include "core/settings.h"
#include "core/system.h"
-
-#include "citra/config.h"
-#include "citra/emu_window/emu_window_sdl2.h"
-
#include "video_core/video_core.h"
static void PrintHelp(const char* argv0) {
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 77679bd88..58aef7a9a 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -2,21 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include "config.h"
#include <memory>
-
-#include <inih/cpp/INIReader.h>
-
#include <SDL.h>
-
+#include <inih/cpp/INIReader.h>
#include "citra/default_ini.h"
-
#include "common/file_util.h"
#include "common/logging/log.h"
-
#include "core/settings.h"
-#include "config.h"
-
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini";
diff --git a/src/citra/config.h b/src/citra/config.h
index 8bd2b294b..b1c31f59c 100644
--- a/src/citra/config.h
+++ b/src/citra/config.h
@@ -6,7 +6,6 @@
#include <memory>
#include <string>
-
#include <inih/cpp/INIReader.h>
class Config {
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp
index 42f2a7553..7df054208 100644
--- a/src/citra/emu_window/emu_window_sdl2.cpp
+++ b/src/citra/emu_window/emu_window_sdl2.cpp
@@ -5,22 +5,16 @@
#include <algorithm>
#include <cstdlib>
#include <string>
-
#define SDL_MAIN_HANDLED
#include <SDL.h>
-
#include <glad/glad.h>
-
+#include "citra/emu_window/emu_window_sdl2.h"
#include "common/key_map.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
-
#include "core/hle/service/hid/hid.h"
#include "core/settings.h"
-
-#include "citra/emu_window/emu_window_sdl2.h"
-
#include "video_core/video_core.h"
void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h
index d4d86821d..e4d14ef12 100644
--- a/src/citra/emu_window/emu_window_sdl2.h
+++ b/src/citra/emu_window/emu_window_sdl2.h
@@ -5,7 +5,6 @@
#pragma once
#include <utility>
-
#include "common/emu_window.h"
struct SDL_Window;