From 7ac1ed7e10533153827cd146880459d7e7b88562 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Sep 2016 14:54:34 +0200 Subject: [PATCH] Cleanups --- frontend/drivers/platform_darwin.m | 10 ++++----- frontend/drivers/platform_emscripten.c | 30 ++++++++++++++------------ frontend/drivers/platform_win32.c | 12 ++++++----- gfx/common/vita2d_common.h | 1 - gfx/common/win32_common.cpp | 3 +-- gfx/drivers/d3d.h | 1 - menu/drivers/xui.cpp | 2 +- ui/drivers/ui_qt.cpp | 8 +++++-- 8 files changed, 36 insertions(+), 31 deletions(-) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 79a54d9918..d573974e8b 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -25,6 +25,10 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #ifdef __OBJC__ #include #include @@ -45,10 +49,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include "../../config.h" -#endif - #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #endif @@ -57,7 +57,7 @@ #include "../../file_path_special.h" #include "../../configuration.h" #include "../../defaults.h" -#include "../../general.h" +#include "../../runloop.h" #include "../../verbosity.h" #include "../../ui/ui_companion_driver.h" diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c index 221245f151..5941702c6a 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -20,29 +20,31 @@ #include #include - -#include "../../configuration.h" -#include "../../defaults.h" -#include "../../general.h" -#include "../../content.h" -#include "../frontend.h" -#include "../../retroarch.h" -#include "../../runloop.h" -#include "../frontend_driver.h" -#include "../../command.h" - +#include #include -#include "../../file_path_special.h" + +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #ifndef IS_SALAMANDER #include #endif -#include +#include "../frontend.h" +#include "../frontend_driver.h" +#include "../../configuration.h" +#include "../../defaults.h" +#include "../../content.h" +#include "../../retroarch.h" +#include "../../runloop.h" +#include "../../command.h" +#include "../../file_path_special.h" static void emscripten_mainloop(void) { unsigned sleep_ms = 0; - int ret = runloop_iterate(&sleep_ms); + int ret = runloop_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) retro_sleep(sleep_ms); task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL); diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c index 4b1638c8cc..0add710a40 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c @@ -23,17 +23,19 @@ #include #include -#include "../frontend_driver.h" -#include "../../configuration.h" -#include "../../general.h" -#include "../../verbosity.h" +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #endif +#include "../frontend_driver.h" +#include "../../configuration.h" #include "../../defaults.h" - +#include "../../runloop.h" +#include "../../verbosity.h" /* We only load this library once, so we let it be * unloaded at application shutdown, since unloading diff --git a/gfx/common/vita2d_common.h b/gfx/common/vita2d_common.h index 836e21e619..30a9e2f8ea 100644 --- a/gfx/common/vita2d_common.h +++ b/gfx/common/vita2d_common.h @@ -23,7 +23,6 @@ #include #include "../../defines/psp_defines.h" -#include "../../general.h" #include "../../driver.h" #include "../video_coord_array.h" diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp index 93feff3a7c..7559ff6532 100644 --- a/gfx/common/win32_common.cpp +++ b/gfx/common/win32_common.cpp @@ -20,11 +20,10 @@ #include "../../config.h" #endif +#include "win32_common.h" #include "../../frontend/frontend_driver.h" #include "../../configuration.h" -#include "../../general.h" #include "../../verbosity.h" -#include "win32_common.h" #include "../../driver.h" #include "../../runloop.h" #include "../../tasks/tasks_internal.h" diff --git a/gfx/drivers/d3d.h b/gfx/drivers/d3d.h index 921250bb22..609703e567 100644 --- a/gfx/drivers/d3d.h +++ b/gfx/drivers/d3d.h @@ -44,7 +44,6 @@ #include #endif -#include "../../general.h" #include "../../driver.h" #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index 434580531a..50c3c7ee62 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -41,7 +41,7 @@ #include "../../gfx/video_context_driver.h" -#include "../../general.h" +#include "../../runloop.h" #include "../../gfx/d3d/d3d.h" diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 2991eb48d6..09bdf2d204 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -22,14 +22,18 @@ #include #include -#include "general.h" +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "ui_qt.h" +#include "qt/wrapper/wrapper.h" #include "../ui_companion_driver.h" #include "../../core.h" #include "../../configuration.h" +#include "../../runloop.h" #include "../../tasks/tasks_internal.h" -#include "qt/wrapper/wrapper.h" #ifdef HAVE_QT_WRAPPER struct Wimp* wimp;