From 6997c207bdc1084c572493a5939f6187653ae5f0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 11 Nov 2013 04:12:30 +0100 Subject: [PATCH] Remove HAVE_FILEBROWSER/remove file_browser.c --- Makefile.psl1ght | 2 +- Makefile.psp1 | 2 +- console/rarch_console.h | 2 - frontend/menu/file_browser.c | 168 ----------------------- frontend/menu/file_browser.h | 44 ------ frontend/menu/menu_common.c | 32 ----- frontend/menu/menu_common.h | 7 - frontend/menu/rmenu_xui.cpp | 14 +- frontend/platform/platform_gx.c | 2 - frontend/platform/platform_ps3.c | 2 - frontend/platform/platform_psp.c | 2 - frontend/platform/platform_xdk.c | 4 - griffin/griffin.c | 3 - msvc/RetroArch-360/RetroArch-360.vcxproj | 12 +- 14 files changed, 21 insertions(+), 275 deletions(-) delete mode 100644 frontend/menu/file_browser.c delete mode 100644 frontend/menu/file_browser.h diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 8ad965e3bf..17b3825474 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -92,7 +92,7 @@ endif RSXGL_DEFINES = -D__RSX__ -DGL3_PROTOTYPES -SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DRARCH_CONSOLE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts +SHARED_FLAGS := $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DRARCH_CONSOLE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts CFLAGS += -std=gnu99 $(SHARED_FLAGS) CXXFLAGS += $(SHARED_FLAGS) diff --git a/Makefile.psp1 b/Makefile.psp1 index ccb08a7b98..42d5de7279 100644 --- a/Makefile.psp1 +++ b/Makefile.psp1 @@ -8,7 +8,7 @@ INCDIR = CFLAGS = -O2 -G0 -g -std=gnu99 -ffast-math ASFLAGS = $(CFLAGS) -RARCH_DEFINES = -DPSP -DHAVE_FILEBROWSER -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_NULLVIDEO -DHAVE_NULLAUDIO +RARCH_DEFINES = -DPSP -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_NULLVIDEO -DHAVE_NULLAUDIO ifeq ($(HAVE_FILE_LOGGER), 1) CFLAGS += -DHAVE_FILE_LOGGER diff --git a/console/rarch_console.h b/console/rarch_console.h index e2d8f9ceac..fb52086b56 100644 --- a/console/rarch_console.h +++ b/console/rarch_console.h @@ -30,8 +30,6 @@ typedef struct char core_dir[MAXIMUM_PATH]; char config_path[MAXIMUM_PATH]; char libretro_path[MAXIMUM_PATH]; - char filebrowser_startup_dir[MAXIMUM_PATH]; - char filesystem_root_dir[MAXIMUM_PATH]; char port_dir[MAXIMUM_PATH]; char savestate_dir[MAXIMUM_PATH]; char sram_dir[MAXIMUM_PATH]; diff --git a/frontend/menu/file_browser.c b/frontend/menu/file_browser.c deleted file mode 100644 index 2cf10f1b46..0000000000 --- a/frontend/menu/file_browser.c +++ /dev/null @@ -1,168 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2013 - Hans-Kristian Arntzen - * Copyright (C) 2011-2013 - Daniel De Matteis - * - * 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 . - */ - -#include "file_browser.h" - -static bool directory_parse(void *data, const char *path) -{ - filebrowser_t *filebrowser = (filebrowser_t*)data; - - struct string_list *list = dir_list_new(path, - filebrowser->current_dir.extensions, true); - if(!list) - return false; - - if (list->size) - dir_list_sort(list, true); - - filebrowser->current_dir.ptr = 0; - strlcpy(filebrowser->current_dir.directory_path, - path, sizeof(filebrowser->current_dir.directory_path)); - - if (filebrowser->list) - dir_list_free(filebrowser->list); - - filebrowser->list = list; - - return true; - -} - -void filebrowser_free(void *data) -{ - filebrowser_t *filebrowser = (filebrowser_t*)data; - - dir_list_free(filebrowser->list); - filebrowser->list = NULL; - filebrowser->current_dir.ptr = 0; - free(filebrowser); -} - -void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_dir) -{ - filebrowser_t *filebrowser = (filebrowser_t*)data; - - if (ext) - strlcpy(filebrowser->current_dir.extensions, ext, - sizeof(filebrowser->current_dir.extensions)); - - strlcpy(filebrowser->current_dir.root_dir, - root_dir, sizeof(filebrowser->current_dir.root_dir)); - filebrowser_iterate(filebrowser, RGUI_ACTION_START); -} - -#define GET_CURRENT_PATH(browser) (browser->list->elems[browser->current_dir.ptr].data) - -bool filebrowser_iterate(void *data, unsigned action) -{ - filebrowser_t *filebrowser = (filebrowser_t*)data; - bool ret = true; - unsigned entries_to_scroll = 19; - - switch(action) - { - case RGUI_ACTION_UP: - if (filebrowser->list->size) - { - filebrowser->current_dir.ptr--; - if (filebrowser->current_dir.ptr >= filebrowser->list->size) - filebrowser->current_dir.ptr = filebrowser->list->size - 1; - } - break; - case RGUI_ACTION_DOWN: - if (filebrowser->list->size) - { - filebrowser->current_dir.ptr++; - if (filebrowser->current_dir.ptr >= filebrowser->list->size) - filebrowser->current_dir.ptr = 0; - } - break; - case RGUI_ACTION_LEFT: - if (filebrowser->list->size) - { - if (filebrowser->current_dir.ptr <= 5) - filebrowser->current_dir.ptr = 0; - else - filebrowser->current_dir.ptr -= 5; - } - break; - case RGUI_ACTION_RIGHT: - if (filebrowser->list->size) - filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + 5, - filebrowser->list->size-1)); - break; - case RGUI_ACTION_SCROLL_UP: - if (filebrowser->list->size) - { - if (filebrowser->current_dir.ptr <= entries_to_scroll) - filebrowser->current_dir.ptr= 0; - else - filebrowser->current_dir.ptr -= entries_to_scroll; - } - break; - case RGUI_ACTION_SCROLL_DOWN: - if (filebrowser->list->size) - filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + - entries_to_scroll, filebrowser->list->size-1)); - break; - case RGUI_ACTION_OK: - ret = directory_parse(filebrowser, GET_CURRENT_PATH(filebrowser)); - break; - case RGUI_ACTION_CANCEL: - { - char tmp_str[PATH_MAX]; - fill_pathname_parent_dir(tmp_str, rgui->browser->current_dir.directory_path, sizeof(tmp_str)); - - if (tmp_str[0] != '\0') - { - fill_pathname_parent_dir(filebrowser->current_dir.directory_path, - filebrowser->current_dir.directory_path, - sizeof(filebrowser->current_dir.directory_path)); - - ret = directory_parse(filebrowser, filebrowser->current_dir.directory_path); - } - else - ret = false; - } - break; - case RGUI_ACTION_START: -#ifdef HAVE_RMENU_XUI - filebrowser_fetch_directory_entries(RGUI_ACTION_OK); -#endif - ret = directory_parse(filebrowser, filebrowser->current_dir.root_dir); - break; - default: - break; - } - - if (ret) - strlcpy(filebrowser->current_dir.path, GET_CURRENT_PATH(filebrowser), - sizeof(filebrowser->current_dir.path)); - - return ret; -} - -bool filebrowser_is_current_entry_dir(void *data) -{ - filebrowser_t *filebrowser = (filebrowser_t*)data; - return filebrowser->list->elems[filebrowser->current_dir.ptr].attr.b; -} - -bool filebrowser_reset_current_dir(void *data) -{ - filebrowser_t *filebrowser = (filebrowser_t*)data; - return directory_parse(filebrowser, filebrowser->current_dir.directory_path); -} diff --git a/frontend/menu/file_browser.h b/frontend/menu/file_browser.h deleted file mode 100644 index c64e92351c..0000000000 --- a/frontend/menu/file_browser.h +++ /dev/null @@ -1,44 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2013 - Hans-Kristian Arntzen - * Copyright (C) 2011-2013 - Daniel De Matteis - * - * 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 FILEBROWSER_H_ -#define FILEBROWSER_H_ - -#include "../../general.h" - -typedef struct -{ - size_t ptr; - char directory_path[PATH_MAX]; - char extensions[PATH_MAX]; - char root_dir[PATH_MAX]; - char path[PATH_MAX]; -} filebrowser_dir_type_t; - -typedef struct -{ - struct string_list *list; - filebrowser_dir_type_t current_dir; - filebrowser_dir_type_t prev_dir; -} filebrowser_t; - -void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_dir); -bool filebrowser_iterate(void *data, unsigned action); -void filebrowser_free(void *data); -bool filebrowser_is_current_entry_dir(void *data); -bool filebrowser_reset_current_dir(void *data); - -#endif /* FILEBROWSER_H_ */ diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index ecd9a18dd7..b66ad5e253 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -407,34 +407,6 @@ void menu_init(void) menu_update_libretro_info(); -#ifdef HAVE_FILEBROWSER - if (!(strlen(g_settings.rgui_browser_directory) > 0)) - strlcpy(g_settings.rgui_browser_directory, default_paths.filebrowser_startup_dir, - sizeof(g_settings.rgui_browser_directory)); - - rgui->browser = (filebrowser_t*)calloc(1, sizeof(*(rgui->browser))); - - if (rgui->browser == NULL) - { - RARCH_ERR("Could not initialize filebrowser.\n"); - rarch_fail(1, "menu_init()"); - } - - // Look for zips to extract as well. - if (*rgui->info.valid_extensions) - { - strlcpy(rgui->browser->current_dir.extensions, rgui->info.valid_extensions, - sizeof(rgui->browser->current_dir.extensions)); - strlcat(rgui->browser->current_dir.extensions, "|zip", - sizeof(rgui->browser->current_dir.extensions)); - } - - strlcpy(rgui->browser->current_dir.root_dir, g_settings.rgui_browser_directory, - sizeof(rgui->browser->current_dir.root_dir)); - - filebrowser_iterate(rgui->browser, RGUI_ACTION_START); -#endif - #ifdef HAVE_SHADER_MANAGER shader_manager_init(rgui); #endif @@ -455,10 +427,6 @@ void menu_free(void) file_list_free(rgui->menu_stack); file_list_free(rgui->selection_buf); -#ifdef HAVE_FILEBROWSER - filebrowser_free(rgui->browser); -#endif - rom_history_free(rgui->history); core_info_list_free(rgui->core_info); diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 4dc146b2fd..1c4af347ee 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -39,9 +39,6 @@ extern "C" { #endif -#ifdef HAVE_FILEBROWSER -#include "file_browser.h" -#endif #include "../../file_list.h" #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) @@ -282,10 +279,6 @@ typedef struct size_t frame_buf_pitch; bool frame_buf_show; -#ifdef HAVE_FILEBROWSER - filebrowser_t *browser; - unsigned menu_type; -#endif file_list_t *menu_stack; file_list_t *selection_buf; size_t selection_ptr; diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index a5899f5e05..1158387c2d 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -228,7 +228,7 @@ static void menu_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned se void filebrowser_fetch_directory_entries(uint64_t action) { - filebrowser_iterate(rgui->browser, action); + //filebrowser_iterate(rgui->browser, action); mbstowcs(strw_buffer, rgui->browser->current_dir.directory_path, sizeof(strw_buffer) / sizeof(wchar_t)); XuiTextElementSetText(m_menutitle, strw_buffer); @@ -251,10 +251,12 @@ HRESULT CRetroArchFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled GetChildById(L"XuiTxtTitle", &m_menutitle); GetChildById(L"XuiTxtBottom", &m_menutitlebottom); +#if 0 filebrowser_set_root_and_ext(rgui->browser, rgui->info.valid_extensions, default_paths.filebrowser_startup_dir); filebrowser_fetch_directory_entries(RGUI_ACTION_OK); +#endif return 0; } @@ -277,8 +279,10 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle else if(rgui->browser->list->elems[index].attr.b) { fill_pathname_join(path, rgui->browser->current_dir.directory_path, str_buffer, sizeof(path)); +#if 0 filebrowser_set_root_and_ext(rgui->browser, rgui->info.valid_extensions, path); filebrowser_fetch_directory_entries(RGUI_ACTION_OK); +#endif } } @@ -1000,8 +1004,10 @@ HRESULT CRetroArchShaderBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandl GetChildById(L"XuiTxtTitle", &m_menutitle); GetChildById(L"XuiTxtBottom", &m_menutitlebottom); +#if 0 filebrowser_set_root_and_ext(rgui->browser, "cg", "game:\\media\\shaders"); filebrowser_fetch_directory_entries(RGUI_ACTION_OK); +#endif return 0; } @@ -1020,8 +1026,10 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand { wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_menulist, index), sizeof(str_buffer)); fill_pathname_join(path, rgui->browser->current_dir.directory_path, str_buffer, sizeof(path)); +#if 0 filebrowser_set_root_and_ext(rgui->browser, "cg", path); filebrowser_fetch_directory_entries(RGUI_ACTION_OK); +#endif } } @@ -1036,8 +1044,10 @@ HRESULT CRetroArchCoreBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled GetChildById(L"XuiTxtTitle", &m_menutitle); GetChildById(L"XuiTxtBottom", &m_menutitlebottom); +#if 0 filebrowser_set_root_and_ext(rgui->browser, "xex|XEX", "game:"); filebrowser_fetch_directory_entries(RGUI_ACTION_OK); +#endif return 0; } @@ -1063,8 +1073,10 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle else if (rgui->browser->list->elems[index].attr.b) { fill_pathname_join(path, rgui->browser->current_dir.directory_path, str_buffer, sizeof(path)); +#if 0 filebrowser_set_root_and_ext(rgui->browser, "xex|XEX", path); filebrowser_fetch_directory_entries(RGUI_ACTION_OK); +#endif } } diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c index a0a0dd3bf2..c2ff4be6fb 100644 --- a/frontend/platform/platform_gx.c +++ b/frontend/platform/platform_gx.c @@ -249,8 +249,6 @@ static void get_environment_settings(int argc, char *argv[], void *args) snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.port_dir); snprintf(default_paths.sram_dir, sizeof(default_paths.savestate_dir), "%s/savefiles", default_paths.port_dir); snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.port_dir); - strlcpy(default_paths.filesystem_root_dir, "/", sizeof(default_paths.filesystem_root_dir)); - strlcpy(default_paths.filebrowser_startup_dir, default_paths.filesystem_root_dir, sizeof(default_paths.filebrowser_startup_dir)); #ifdef IS_SALAMANDER if (argc > 2 && argv[1] != NULL && argv[2] != NULL) diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index e1eb697ba0..f3e29f3055 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -264,8 +264,6 @@ static void get_environment_settings(int argc, char *argv[], void *args) fill_pathname_join(default_paths.core_dir, default_paths.port_dir, "cores", sizeof(default_paths.core_dir)); fill_pathname_join(default_paths.savestate_dir, default_paths.core_dir, "savestates", sizeof(default_paths.savestate_dir)); - strlcpy(default_paths.filesystem_root_dir, "/", sizeof(default_paths.filesystem_root_dir)); - strlcpy(default_paths.filebrowser_startup_dir, default_paths.filesystem_root_dir, sizeof(default_paths.filebrowser_startup_dir)); fill_pathname_join(default_paths.sram_dir, default_paths.core_dir, "savefiles", sizeof(default_paths.sram_dir)); fill_pathname_join(default_paths.system_dir, default_paths.core_dir, "system", sizeof(default_paths.system_dir)); diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c index 0b0ef25c75..36b123e44f 100644 --- a/frontend/platform/platform_psp.c +++ b/frontend/platform/platform_psp.c @@ -59,8 +59,6 @@ static void get_environment_settings(int argc, char *argv[]) snprintf(default_paths.core_dir, sizeof(default_paths.core_dir), "%s/cores", default_paths.port_dir); snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.core_dir); - snprintf(default_paths.filesystem_root_dir, sizeof(default_paths.filesystem_root_dir), "/"); - snprintf(default_paths.filebrowser_startup_dir, sizeof(default_paths.filebrowser_startup_dir), default_paths.filesystem_root_dir); snprintf(default_paths.sram_dir, sizeof(default_paths.sram_dir), "%s/savefiles", default_paths.core_dir); snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.core_dir); diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 900f7604b0..7b7a623d2c 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -231,15 +231,12 @@ static void get_environment_settings(int argc, char *argv[], void *args) fill_pathname_join(default_paths.savestate_dir, default_paths.core_dir, "savestates", sizeof(default_paths.savestate_dir)); fill_pathname_join(default_paths.sram_dir, default_paths.core_dir, "savefiles", sizeof(default_paths.sram_dir)); fill_pathname_join(default_paths.system_dir, default_paths.core_dir, "system", sizeof(default_paths.system_dir)); - strlcpy(default_paths.filesystem_root_dir, default_paths.core_dir, sizeof(default_paths.filesystem_root_dir)); - strlcpy(default_paths.filebrowser_startup_dir, default_paths.core_dir, sizeof(default_paths.filebrowser_startup_dir)); #ifndef IS_SALAMANDER fill_pathname_join(g_settings.screenshot_directory, default_paths.core_dir, "screenshots", sizeof(g_settings.screenshot_directory)); #endif strlcpy(default_paths.menu_border_file, "D:\\Media\\main-menu_480p.png", sizeof(default_paths.menu_border_file)); #elif defined(_XBOX360) strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir)); - strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir)); #ifdef IS_SALAMANDER strlcpy(default_paths.config_path, "game:\\retroarch.cfg", sizeof(default_paths.config_path)); #else @@ -249,7 +246,6 @@ static void get_environment_settings(int argc, char *argv[], void *args) strlcpy(default_paths.savestate_dir, "game:\\savestates", sizeof(default_paths.savestate_dir)); strlcpy(default_paths.sram_dir, "game:\\savefiles", sizeof(default_paths.sram_dir)); strlcpy(default_paths.system_dir, "game:\\system", sizeof(default_paths.system_dir)); - strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir)); #endif } diff --git a/griffin/griffin.c b/griffin/griffin.c index fce3d465f7..805fc953ac 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -523,9 +523,6 @@ MENU #include "../frontend/menu/menu_settings.c" #include "../frontend/menu/history.c" -#ifdef HAVE_FILEBROWSER -#include "../frontend/menu/file_browser.c" -#endif #include "../file_list.c" #if defined(HAVE_RMENU) diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj index 46432ec032..6fe8b05f04 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG + _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG Callcap @@ -151,7 +151,7 @@ AnalyzeOnly false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;WANT_RPNG + _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;WANT_RPNG Callcap @@ -190,7 +190,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG + NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG Callcap @@ -234,7 +234,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG + NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG true @@ -275,7 +275,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE=1;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG + NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG true @@ -316,7 +316,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG true