mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11270 from jdgleaver/buildfix

Browse Source 
(dir_init_shader/dir_check_shader) DISABLE_MENU=1 buildfix
This commit is contained in:
Autechre 2020-09-01 18:35:06 +02:00 committed by GitHub
commit 7dff69808a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroarch.c
View File

@ -11746,8 +11746,13 @@ static void dir_init_shader(struct rarch_state *p_rarch)
bool shader_remember_last_dir = settings->bools.video_shader_remember_last_dir; bool shader_remember_last_dir = settings->bools.video_shader_remember_last_dir;
const char *directory_video_shader = settings->paths.directory_video_shader; const char *directory_video_shader = settings->paths.directory_video_shader;
const char *directory_menu_config = settings->paths.directory_menu_config; const char *directory_menu_config = settings->paths.directory_menu_config;
#if defined(HAVE_MENU)
enum rarch_shader_type last_shader_preset_type = menu_driver_get_last_shader_preset_type(); enum rarch_shader_type last_shader_preset_type = menu_driver_get_last_shader_preset_type();
const char *last_shader_preset_dir = menu_driver_get_last_shader_preset_dir(); const char *last_shader_preset_dir = menu_driver_get_last_shader_preset_dir();
#else
enum rarch_shader_type last_shader_preset_type = RARCH_SHADER_NONE;
const char *last_shader_preset_dir = NULL;
#endif
/* Always free existing shader list */ /* Always free existing shader list */
dir_free_shader(p_rarch); dir_free_shader(p_rarch);
@ -11813,8 +11818,13 @@ static void dir_check_shader(struct rarch_state *p_rarch,
&p_rarch->dir_shader_list; &p_rarch->dir_shader_list;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
bool shader_remember_last_dir = settings->bools.video_shader_remember_last_dir; bool shader_remember_last_dir = settings->bools.video_shader_remember_last_dir;
#if defined(HAVE_MENU)
enum rarch_shader_type last_shader_preset_type = menu_driver_get_last_shader_preset_type(); enum rarch_shader_type last_shader_preset_type = menu_driver_get_last_shader_preset_type();
const char *last_shader_preset_dir = menu_driver_get_last_shader_preset_dir(); const char *last_shader_preset_dir = menu_driver_get_last_shader_preset_dir();
#else
enum rarch_shader_type last_shader_preset_type = RARCH_SHADER_NONE;
const char *last_shader_preset_dir = NULL;
#endif
/* Check whether shader list needs to be /* Check whether shader list needs to be
* (re)initialised */ * (re)initialised */