From b00bf17153c848dddf7b10f2ceb85c40933d02ac Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 17 Feb 2020 01:54:07 +0100 Subject: [PATCH] Move menu_widgets to gfx/ and call it gfx_widgets --- .vscode/settings.json | 2 +- Makefile.common | 2 +- cheevos-new/cheevos.c | 2 +- gfx/common/metal_common.m | 2 +- gfx/drivers/d3d10.c | 2 +- gfx/drivers/d3d11.c | 2 +- gfx/drivers/d3d12.c | 2 +- gfx/drivers/d3d9.c | 2 +- gfx/drivers/gl.c | 2 +- gfx/drivers/gl1.c | 2 +- gfx/drivers/gl_core.c | 2 +- gfx/drivers/gx2_gfx.c | 2 +- gfx/drivers/metal.m | 2 +- gfx/drivers/vita2d_gfx.c | 2 +- gfx/drivers/vulkan.c | 2 +- menu/widgets/menu_widgets.c => gfx/gfx_widgets.c | 16 ++++++++-------- menu/widgets/menu_widgets.h => gfx/gfx_widgets.h | 0 griffin/griffin.c | 2 +- menu/drivers/rgui.c | 2 +- menu/menu_driver.c | 2 +- retroarch.c | 2 +- tasks/task_content.c | 2 +- tasks/task_screenshot.c | 2 +- wifi/drivers/connmanctl.c | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) rename menu/widgets/menu_widgets.c => gfx/gfx_widgets.c (99%) rename menu/widgets/menu_widgets.h => gfx/gfx_widgets.h (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index ef7836f81b..56db7a117f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -42,7 +42,7 @@ "core_info.h": "c", "thread": "c", "xlocale": "c", - "menu_widgets.h": "c", + "gfx_widgets.h": "c", "message_queue.h": "c", "task_queue.h": "c", "fifo_queue.h": "c", diff --git a/Makefile.common b/Makefile.common index 89d1a12ade..1d71f2b7b8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -840,7 +840,7 @@ ifeq ($(HAVE_MENU_COMMON), 1) menu/drivers/menu_generic.o \ ifeq ($(HAVE_MENU_WIDGETS), 1) - OBJ += menu/widgets/menu_widgets.o + OBJ += gfx/gfx_widgets.o endif endif diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c index eb812e31b6..566e0d5519 100644 --- a/cheevos-new/cheevos.c +++ b/cheevos-new/cheevos.c @@ -37,7 +37,7 @@ #include "../menu/menu_driver.h" #include "../menu/menu_entries.h" #ifdef HAVE_MENU_WIDGETS -#include "../menu/widgets/menu_widgets.h" +#include "../gfx/gfx_widgets.h" #endif #endif diff --git a/gfx/common/metal_common.m b/gfx/common/metal_common.m index d547aa2388..87d7d68b6d 100644 --- a/gfx/common/metal_common.m +++ b/gfx/common/metal_common.m @@ -32,7 +32,7 @@ #ifdef HAVE_MENU #import "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#import "../../menu/widgets/menu_widgets.h" +#import "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c index f59c169f83..4a50b0b9ff 100644 --- a/gfx/drivers/d3d10.c +++ b/gfx/drivers/d3d10.c @@ -42,7 +42,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c index 28277b4a3c..1a01767759 100644 --- a/gfx/drivers/d3d11.c +++ b/gfx/drivers/d3d11.c @@ -32,7 +32,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index d0f914bbb6..03a3775c41 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -38,7 +38,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 6122eeb5c0..0b7d128009 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -59,7 +59,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index ee04663bd8..fe6ac0162c 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -80,7 +80,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c index 7afcbbda8d..1290d97217 100644 --- a/gfx/drivers/gl1.c +++ b/gfx/drivers/gl1.c @@ -35,7 +35,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c index faf13c63f7..2166366305 100644 --- a/gfx/drivers/gl_core.c +++ b/gfx/drivers/gl_core.c @@ -47,7 +47,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c index c2879c12f8..3d9ab410e7 100644 --- a/gfx/drivers/gx2_gfx.c +++ b/gfx/drivers/gx2_gfx.c @@ -34,7 +34,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m index 8fbb49151a..62f9148935 100644 --- a/gfx/drivers/metal.m +++ b/gfx/drivers/metal.m @@ -38,7 +38,7 @@ #ifdef HAVE_MENU #import "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#import "../../menu/widgets/menu_widgets.h" +#import "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 6cfd70ac56..8a8c7e7c98 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -27,7 +27,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 558cca71c9..fd82528e35 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -37,7 +37,7 @@ #ifdef HAVE_MENU #include "../../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx_widgets.h" #endif #endif diff --git a/menu/widgets/menu_widgets.c b/gfx/gfx_widgets.c similarity index 99% rename from menu/widgets/menu_widgets.c rename to gfx/gfx_widgets.c index d5b58984d1..09cbd0285f 100644 --- a/menu/widgets/menu_widgets.c +++ b/gfx/gfx_widgets.c @@ -24,19 +24,19 @@ #include #include -#include "menu_widgets.h" +#include "gfx_widgets.h" + +#include "gfx_animation.h" +#include "gfx_display.h" +#include "font_driver.h" #ifdef HAVE_ACCESSIBILITY -#include "../../accessibility.h" +#include "../accessibility.h" #endif -#include "../../msg_hash.h" +#include "../msg_hash.h" -#include "../../tasks/task_content.h" - -#include "../../gfx/gfx_animation.h" -#include "../../gfx/gfx_display.h" -#include "../../gfx/font_driver.h" +#include "../tasks/task_content.h" /* TODO: Fix context reset freezing everything in place (probably kills animations when it shouldn't anymore) */ diff --git a/menu/widgets/menu_widgets.h b/gfx/gfx_widgets.h similarity index 100% rename from menu/widgets/menu_widgets.h rename to gfx/gfx_widgets.h diff --git a/griffin/griffin.c b/griffin/griffin.c index 52eb54d0e1..244ad396fa 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1274,7 +1274,7 @@ MENU #include "../menu/widgets/menu_dialog.c" #include "../menu/widgets/menu_input_bind_dialog.c" #ifdef HAVE_MENU_WIDGETS -#include "../menu/widgets/menu_widgets.c" +#include "../gfx/gfx_widgets.c" #endif #include "../menu/widgets/menu_osk.c" #include "../menu/cbs/menu_cbs_ok.c" diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 04c393c2e4..4a563614f3 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -40,7 +40,7 @@ #endif #if defined(HAVE_MENU_WIDGETS) -#include "../widgets/menu_widgets.h" +#include "../../gfx/gfx_widgets.h" #endif #include "../../playlist.h" diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 026e71dce7..327ce37a03 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -40,7 +40,7 @@ #include "menu_entries.h" #include "widgets/menu_dialog.h" #ifdef HAVE_MENU_WIDGETS -#include "widgets/menu_widgets.h" +#include "../gfx/gfx_widgets.h" #endif #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #include "menu_shader.h" diff --git a/retroarch.c b/retroarch.c index 433fd55bc3..d8ff98fd78 100644 --- a/retroarch.c +++ b/retroarch.c @@ -140,7 +140,7 @@ #include "menu/widgets/menu_dialog.h" #include "menu/widgets/menu_input_bind_dialog.h" #ifdef HAVE_MENU_WIDGETS -#include "menu/widgets/menu_widgets.h" +#include "gfx/gfx_widgets.h" #endif #include "menu/widgets/menu_osk.h" #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) diff --git a/tasks/task_content.c b/tasks/task_content.c index 0c26f128bf..43474cb455 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -73,7 +73,7 @@ #ifdef HAVE_MENU #include "../menu/menu_driver.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx/gfx_widgets.h" #endif #endif diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index fc4a3098c3..0d18dbf2f2 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -44,7 +44,7 @@ #endif #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS) -#include "../../menu/widgets/menu_widgets.h" +#include "../gfx/gfx_widgets.h" #endif #include "../defaults.h" diff --git a/wifi/drivers/connmanctl.c b/wifi/drivers/connmanctl.c index 7d4ce321b3..6d636b8d71 100644 --- a/wifi/drivers/connmanctl.c +++ b/wifi/drivers/connmanctl.c @@ -24,7 +24,7 @@ #include "../../retroarch.h" #include "../../lakka.h" #ifdef HAVE_MENU_WIDGETS -#include "../../menu/widgets/menu_widgets.h" +#include "../../gfx/gfx_widgets.h" #endif static bool connman_cache[256] = {0};