From e82c439d817cc3f4cda989e0e2798410ad656b31 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 23:52:45 +0100 Subject: [PATCH] Rename menu/disp to menu/drivers_display and menu/backend to menu/drivers_backend --- Makefile.common | 12 ++++++------ apple/iOS/platform.m | 2 +- frontend/drivers/platform_apple.c | 4 +++- griffin/griffin.c | 18 +++++++++--------- .../menu_common_backend.c | 0 .../menu_lakka_backend.c | 2 +- menu/{disp => drivers_display}/glui.c | 0 menu/{disp => drivers_display}/ios.c | 0 menu/{disp => drivers_display}/ios.h | 0 menu/{disp => drivers_display}/lakka.c | 0 menu/{disp => drivers_display}/lakka.h | 0 menu/{disp => drivers_display}/rgui.c | 0 menu/{disp => drivers_display}/rmenu.c | 0 menu/{disp => drivers_display}/rmenu_xui.cpp | 0 menu/{disp => drivers_display}/shared.h | 0 menu/{disp => drivers_display}/xmb.c | 0 16 files changed, 20 insertions(+), 18 deletions(-) rename menu/{backend => drivers_backend}/menu_common_backend.c (100%) rename menu/{backend => drivers_backend}/menu_lakka_backend.c (99%) rename menu/{disp => drivers_display}/glui.c (100%) rename menu/{disp => drivers_display}/ios.c (100%) rename menu/{disp => drivers_display}/ios.h (100%) rename menu/{disp => drivers_display}/lakka.c (100%) rename menu/{disp => drivers_display}/lakka.h (100%) rename menu/{disp => drivers_display}/rgui.c (100%) rename menu/{disp => drivers_display}/rmenu.c (100%) rename menu/{disp => drivers_display}/rmenu_xui.cpp (100%) rename menu/{disp => drivers_display}/shared.h (100%) rename menu/{disp => drivers_display}/xmb.c (100%) diff --git a/Makefile.common b/Makefile.common index 7374567e80..0fa20520a1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -274,26 +274,26 @@ ifeq ($(HAVE_NEON),1) endif ifeq ($(HAVE_RGUI), 1) - OBJ += menu/disp/rgui.o + OBJ += menu/drivers_display/rgui.o DEFINES += -DHAVE_MENU -DHAVE_RGUI HAVE_MENU_COMMON = 1 ifeq ($(HAVE_GLUI), 1) - OBJ += menu/disp/glui.o + OBJ += menu/drivers_display/glui.o DEFINES += -DHAVE_GLUI endif ifeq ($(HAVE_XMB), 1) - OBJ += menu/disp/xmb.o + OBJ += menu/drivers_display/xmb.o DEFINES += -DHAVE_XMB endif ifeq ($(HAVE_LAKKA), 1) - OBJ += menu/backend/menu_lakka_backend.o \ - menu/disp/lakka.o + OBJ += menu/drivers_backend/menu_lakka_backend.o \ + menu/drivers_display/lakka.o DEFINES += -DHAVE_LAKKA endif endif ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += menu/backend/menu_common_backend.o \ + OBJ += menu/drivers_backend/menu_common_backend.o \ menu/menu_input.o \ menu/menu.o \ menu/menu_common_list.o \ diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index 3a02decdb8..a4013e5c03 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -27,7 +27,7 @@ #include "bluetooth/btdynamic.h" #include "bluetooth/btpad.h" -#include "../../menu/disp/ios.h" +#include "../../menu/drivers_display/ios.h" id apple_platform; diff --git a/frontend/drivers/platform_apple.c b/frontend/drivers/platform_apple.c index d7045c4532..e60d7ab7d3 100644 --- a/frontend/drivers/platform_apple.c +++ b/frontend/drivers/platform_apple.c @@ -19,7 +19,9 @@ #include "../frontend.h" #include "../../runloop.h" -#include "../../menu/disp/ios.h" +#ifdef IOS +#include "../../menu/drivers_display/ios.h" +#endif #include #include diff --git a/griffin/griffin.c b/griffin/griffin.c index 146d72fe9b..74182bfc16 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -679,40 +679,40 @@ MENU #include "../menu/menu_navigation.c" #include "../menu/menu_animation.c" -#include "../menu/backend/menu_common_backend.c" +#include "../menu/drivers_backend/menu_common_backend.c" #endif #ifdef HAVE_RMENU -#include "../menu/disp/rmenu.c" +#include "../menu/drivers_display/rmenu.c" #endif #ifdef HAVE_RGUI -#include "../menu/disp/rgui.c" +#include "../menu/drivers_display/rgui.c" #endif #ifdef HAVE_RMENU_XUI -#include "../menu/disp/rmenu_xui.cpp" +#include "../menu/drivers_display/rmenu_xui.cpp" #endif #ifdef HAVE_OPENGL #ifdef HAVE_LAKKA -#include "../menu/backend/menu_lakka_backend.c" -#include "../menu/disp/lakka.c" +#include "../menu/drivers_backend/menu_lakka_backend.c" +#include "../menu/drivers_display/lakka.c" #endif #ifdef HAVE_XMB -#include "../menu/disp/xmb.c" +#include "../menu/drivers_display/xmb.c" #endif #ifdef HAVE_GLUI -#include "../menu/disp/glui.c" +#include "../menu/drivers_display/glui.c" #endif #endif #ifdef IOS -#include "../menu/disp/ios.c" +#include "../menu/drivers_display/ios.c" #endif #ifdef HAVE_COMMAND diff --git a/menu/backend/menu_common_backend.c b/menu/drivers_backend/menu_common_backend.c similarity index 100% rename from menu/backend/menu_common_backend.c rename to menu/drivers_backend/menu_common_backend.c diff --git a/menu/backend/menu_lakka_backend.c b/menu/drivers_backend/menu_lakka_backend.c similarity index 99% rename from menu/backend/menu_lakka_backend.c rename to menu/drivers_backend/menu_lakka_backend.c index 843efa45e2..f4833ecc71 100644 --- a/menu/backend/menu_lakka_backend.c +++ b/menu/drivers_backend/menu_lakka_backend.c @@ -34,7 +34,7 @@ #include "../../settings_data.h" #include "../../retroarch.h" -#include "../disp/lakka.h" +#include "../drivers_display/lakka.h" #include "../menu_animation.h" #ifdef HAVE_CONFIG_H diff --git a/menu/disp/glui.c b/menu/drivers_display/glui.c similarity index 100% rename from menu/disp/glui.c rename to menu/drivers_display/glui.c diff --git a/menu/disp/ios.c b/menu/drivers_display/ios.c similarity index 100% rename from menu/disp/ios.c rename to menu/drivers_display/ios.c diff --git a/menu/disp/ios.h b/menu/drivers_display/ios.h similarity index 100% rename from menu/disp/ios.h rename to menu/drivers_display/ios.h diff --git a/menu/disp/lakka.c b/menu/drivers_display/lakka.c similarity index 100% rename from menu/disp/lakka.c rename to menu/drivers_display/lakka.c diff --git a/menu/disp/lakka.h b/menu/drivers_display/lakka.h similarity index 100% rename from menu/disp/lakka.h rename to menu/drivers_display/lakka.h diff --git a/menu/disp/rgui.c b/menu/drivers_display/rgui.c similarity index 100% rename from menu/disp/rgui.c rename to menu/drivers_display/rgui.c diff --git a/menu/disp/rmenu.c b/menu/drivers_display/rmenu.c similarity index 100% rename from menu/disp/rmenu.c rename to menu/drivers_display/rmenu.c diff --git a/menu/disp/rmenu_xui.cpp b/menu/drivers_display/rmenu_xui.cpp similarity index 100% rename from menu/disp/rmenu_xui.cpp rename to menu/drivers_display/rmenu_xui.cpp diff --git a/menu/disp/shared.h b/menu/drivers_display/shared.h similarity index 100% rename from menu/disp/shared.h rename to menu/drivers_display/shared.h diff --git a/menu/disp/xmb.c b/menu/drivers_display/xmb.c similarity index 100% rename from menu/disp/xmb.c rename to menu/drivers_display/xmb.c