Merge pull request #11618 from davidgfnet/master

Make get_lakka_version available in all builds
This commit is contained in:
Autechre 2020-11-25 15:47:20 +01:00 committed by GitHub
commit 94534be4a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 17 additions and 8 deletions

View File

@ -670,6 +670,7 @@ frontend_ctx_driver_t frontend_ctx_ctr =
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -972,6 +972,7 @@ frontend_ctx_driver_t frontend_ctx_darwin = {
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -201,6 +201,7 @@ frontend_ctx_driver_t frontend_ctx_dos = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -193,6 +193,7 @@ frontend_ctx_driver_t frontend_ctx_emscripten = {
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -563,6 +563,7 @@ frontend_ctx_driver_t frontend_ctx_gx = {
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -364,6 +364,7 @@ frontend_ctx_driver_t frontend_ctx_orbis = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -382,9 +382,7 @@ frontend_ctx_driver_t frontend_ctx_ps2 = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
#ifdef HAVE_LAKKA
NULL, /* get_lakka_version */
#endif
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -706,6 +706,7 @@ frontend_ctx_driver_t frontend_ctx_ps3 = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -640,6 +640,7 @@ frontend_ctx_driver_t frontend_ctx_psp = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -200,6 +200,7 @@ frontend_ctx_driver_t frontend_ctx_qnx = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -927,6 +927,7 @@ frontend_ctx_driver_t frontend_ctx_switch =
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -2716,6 +2716,8 @@ frontend_ctx_driver_t frontend_ctx_unix = {
NULL, /* detach_console */
#ifdef HAVE_LAKKA
frontend_unix_get_lakka_version, /* get_lakka_version */
#else
NULL, /* get_lakka_version */
#endif
frontend_unix_watch_path_for_changes,
frontend_unix_check_for_path_changes,

View File

@ -470,6 +470,7 @@ frontend_ctx_driver_t frontend_ctx_uwp = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -325,6 +325,7 @@ frontend_ctx_driver_t frontend_ctx_wiiu =
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -1145,6 +1145,7 @@ frontend_ctx_driver_t frontend_ctx_win32 = {
NULL, /* destroy_sighandler_state */
frontend_win32_attach_console, /* attach_console */
frontend_win32_detach_console, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -436,6 +436,7 @@ frontend_ctx_driver_t frontend_ctx_xdk = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -92,6 +92,7 @@ frontend_ctx_driver_t frontend_ctx_qnx = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
NULL, /* get_lakka_version */
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -62,9 +62,7 @@ static frontend_ctx_driver_t frontend_ctx_null = {
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
#ifdef HAVE_LAKKA
NULL, /* get_lakka_version */
#endif
NULL, /* watch_path_for_changes */
NULL, /* check_for_path_changes */
NULL, /* set_sustained_performance_mode */

View File

@ -102,9 +102,7 @@ typedef struct frontend_ctx_driver
void (*destroy_signal_handler_state)(void);
void (*attach_console)(void);
void (*detach_console)(void);
#ifdef HAVE_LAKKA
void (*get_lakka_version)(char *, size_t);
#endif
void (*watch_path_for_changes)(struct string_list *list, int flags, path_change_data_t **change_data);
bool (*check_for_path_changes)(path_change_data_t *change_data);
void (*set_sustained_performance_mode)(bool on);

View File

@ -1094,7 +1094,6 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
MENU_SETTINGS_CORE_INFO_NONE, 0, 0))
count++;
#ifdef HAVE_LAKKA
if (frontend->get_lakka_version)
{
frontend->get_lakka_version(tmp2, sizeof(tmp2));
@ -1109,7 +1108,6 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
MENU_SETTINGS_CORE_INFO_NONE, 0, 0))
count++;
}
#endif
if (frontend->get_name)
{