diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h index fc013d1f57..bc753e5e53 100644 --- a/frontend/frontend_context.h +++ b/frontend/frontend_context.h @@ -24,12 +24,6 @@ #include "../config.h" #endif -#if defined(HAVE_RGUI) -#include "menu/rgui.h" -#elif defined(HAVE_RMENU) -#include "menu/rmenu.h" -#endif - typedef struct frontend_ctx_driver { void (*environment_get)(int argc, char *argv[], void *args); diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index e46ef2caac..5747d41ff5 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -21,7 +21,7 @@ #include #include -#include "rgui.h" +#include "menu_common.h" #include "menu_context.h" #include "../../file_list.h" #include "../../general.h" diff --git a/frontend/menu/rgui.h b/frontend/menu/rgui.h deleted file mode 100644 index d6ea5cb17a..0000000000 --- a/frontend/menu/rgui.h +++ /dev/null @@ -1,40 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2013 - Hans-Kristian Arntzen - * Copyright (C) 2011-2013 - Daniel De Matteis - * Copyright (C) 2012-2013 - Michael Lelli - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef RGUI_H__ -#define RGUI_H__ - -#include "menu_common.h" - -#include -#include - -#ifndef __cplusplus -#include -#else -extern "C" { -#endif - -typedef void (*rgui_file_enum_cb_t)(void *ctx, - const char *path, unsigned file_type, size_t directory_ptr); -typedef bool (*rgui_folder_enum_cb_t)(const char *directory, - rgui_file_enum_cb_t file_cb, void *userdata, void *ctx); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/gx/gx_video.c b/gx/gx_video.c index ee0e89d5fd..f0b175c60d 100644 --- a/gx/gx_video.c +++ b/gx/gx_video.c @@ -18,7 +18,7 @@ #include "../driver.h" #include "../general.h" #include "../gfx/fonts/bitmap.h" -#include "../frontend/menu/rgui.h" +#include "../frontend/menu/menu_common.h" #include "../gfx/gfx_common.h" #ifdef HW_RVL