ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2015-01-09 03:45:18 +01:00
parent 102ec37365
commit 8ae9f9daf3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/menu_common.h
View File

@ -134,7 +134,6 @@ typedef enum
MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND,
MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS,
// Match up with libretro order for simplicity.
MENU_SETTINGS_BIND_BEGIN, MENU_SETTINGS_BIND_BEGIN,
MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS, MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS,
MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE, MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE,

4
menu/menu_shader.c
View File

@ -23,6 +23,7 @@
void menu_shader_manager_init(void *data) void menu_shader_manager_init(void *data)
{ {
char cgp_path[PATH_MAX_LENGTH]; char cgp_path[PATH_MAX_LENGTH];
const char *ext;
struct gfx_shader *shader = NULL; struct gfx_shader *shader = NULL;
config_file_t *conf = NULL; config_file_t *conf = NULL;
const char *config_path = NULL; const char *config_path = NULL;
@ -58,8 +59,7 @@ void menu_shader_manager_init(void *data)
strlcpy(menu->default_cgp, "menu.cgp", sizeof(menu->default_cgp)); strlcpy(menu->default_cgp, "menu.cgp", sizeof(menu->default_cgp));
} }
ext = path_get_extension(g_settings.video.shader_path);
const char *ext = path_get_extension(g_settings.video.shader_path);
if (strcmp(ext, "glslp") == 0 || strcmp(ext, "cgp") == 0) if (strcmp(ext, "glslp") == 0 || strcmp(ext, "cgp") == 0)
{ {
conf = config_file_new(g_settings.video.shader_path); conf = config_file_new(g_settings.video.shader_path);