CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 19:24:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Wii) Fix build

Browse Source
This commit is contained in:
twinaphex 2016-12-24 03:21:29 +01:00
parent 70a1a5f38e
commit c27038d9bd
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/cbs/menu_cbs_deferred_push.c
View File

@ -454,11 +454,11 @@ end:
}
#ifdef HAVE_LIBRETRODB
static int deferred_push_cursor_manager_list_generic(
menu_displaylist_info_t *info, enum database_query_type type)
{
int ret = -1;
#ifdef HAVE_LIBRETRODB
char query[PATH_MAX_LENGTH];
struct string_list *str_list = string_split(info->path, "|");
@ -477,7 +477,6 @@ static int deferred_push_cursor_manager_list_generic(
end:
string_list_free(str_list);
#endif
return ret;
}
@ -576,6 +575,7 @@ static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyea
{
return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_RELEASEDATE_YEAR);
}
#endif
#if 0
static int deferred_push_cursor_manager_list_deferred_query_subsearch(
@ -1119,6 +1119,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred);
break;
#ifdef HAVE_LIBRETRODB
case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_publisher);
break;
@ -1167,6 +1168,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear);
break;
#endif
case MENU_ENUM_LABEL_CORE_INFORMATION:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);
break;
@ -1406,6 +1408,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_database_manager_list_deferred);
break;
#ifdef HAVE_LIBRETRODB
case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred);
break;
@ -1457,6 +1460,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear);
break;
#endif
case MENU_LABEL_CORE_INFORMATION:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);
break;

14
menu/menu_displaylist.c
View File

@ -6057,10 +6057,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
break;
case DISPLAYLIST_SHADER_PRESET:
{
struct string_list *str_list;
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
union string_list_elem_attr attr;
struct string_list *str_list = string_list_new();
attr.i = 0;
#endif
str_list = string_list_new();
filebrowser_clear_type();
info->type_default = FILE_TYPE_SHADER_PRESET;
@ -6080,13 +6082,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
break;
case DISPLAYLIST_SHADER_PASS:
{
struct string_list *str_list;
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
union string_list_elem_attr attr;
struct string_list *str_list = string_list_new();
attr.i = 0;
#endif
str_list = string_list_new();
filebrowser_clear_type();
info->type_default = FILE_TYPE_SHADER;
attr.i = 0;
#ifdef HAVE_CG
string_list_append(str_list, "cg", attr);

4
tasks/task_screenshot.c
View File

@ -86,7 +86,6 @@ typedef struct
**/
static void task_screenshot_handler(retro_task_t *task)
{
settings_t *settings = config_get_ptr();
screenshot_task_state_t *state = (screenshot_task_state_t*)task->state;
bool is_paused = runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL);
bool ret = false;
@ -155,6 +154,8 @@ static void task_screenshot_handler(retro_task_t *task)
#ifdef HAVE_IMAGEVIEWER
if (ret && !state->silence)
{
settings_t *settings = config_get_ptr();
if (
settings->history_list_enable
&& g_defaults.image_history
@ -169,6 +170,7 @@ static void task_screenshot_handler(retro_task_t *task)
)
)
playlist_write_file(g_defaults.image_history);
}
#endif
task->progress = 100;