Rename menu/disp to menu/drivers_display and menu/backend to

menu/drivers_backend

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 \

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<RetroArch_Platform> apple_platform;
 

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 <stdint.h>
 #include <boolean.h>

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

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