From b5b480ec15b7b6d27fb001e0b6e789d9f06e5cbf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 7 Oct 2013 08:45:32 +0000 Subject: [PATCH] (RMenu/RGUI) Move file_browser.h/file_list.h up one level --- frontend/menu/{utils => }/file_browser.h | 2 +- frontend/menu/{utils => }/file_list.h | 0 frontend/menu/menu_common.h | 4 ++-- frontend/menu/rgui.c | 2 +- frontend/menu/rmenu.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename frontend/menu/{utils => }/file_browser.h (98%) rename frontend/menu/{utils => }/file_list.h (100%) diff --git a/frontend/menu/utils/file_browser.h b/frontend/menu/file_browser.h similarity index 98% rename from frontend/menu/utils/file_browser.h rename to frontend/menu/file_browser.h index 4404292f88..35f286625c 100644 --- a/frontend/menu/utils/file_browser.h +++ b/frontend/menu/file_browser.h @@ -17,7 +17,7 @@ #ifndef FILEBROWSER_H_ #define FILEBROWSER_H_ -#include "../../../general.h" +#include "../../general.h" typedef struct { diff --git a/frontend/menu/utils/file_list.h b/frontend/menu/file_list.h similarity index 100% rename from frontend/menu/utils/file_list.h rename to frontend/menu/file_list.h diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index a9a09aa0f6..a467353e17 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -39,9 +39,9 @@ extern "C" { #endif #ifdef HAVE_FILEBROWSER -#include "utils/file_browser.h" +#include "file_browser.h" #endif -#include "utils/file_list.h" +#include "file_list.h" #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #define HAVE_SHADER_MANAGER diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 3898012434..bb23df7e6f 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -24,7 +24,7 @@ #include "rgui.h" #include "menu_context.h" -#include "utils/file_list.h" +#include "file_list.h" #include "../../general.h" #include "../../file_ext.h" #include "../../gfx/gfx_common.h" diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index c247f5daa1..1ba35e30c8 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -15,7 +15,7 @@ */ #include "rmenu.h" -#include "utils/file_browser.h" +#include "file_browser.h" #if defined(__CELLOS_LV2__) #include