mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(UWP) Enable core downloader/updater (#14173)

Browse Source
This commit is contained in:
Cthulhu-throwaway 2022-07-14 10:21:49 -03:00 committed by GitHub
parent c5c5e7539f
commit f5d46681c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.def.h
View File

@ -1626,9 +1626,9 @@ static const bool enable_device_vibration = false;
#endif #endif
#else #else
#if defined(__x86_64__) || defined(_M_X64) #if defined(__x86_64__) || defined(_M_X64)
#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/" #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"
#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/" #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/"
#elif defined(__arm__) || defined(_M_ARM) #elif defined(__arm__) || defined(_M_ARM)
#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/" #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"
#elif defined(__aarch64__) || defined(_M_ARM64) #elif defined(__aarch64__) || defined(_M_ARM64)

18
menu/menu_displaylist.c
View File

@ -469,11 +469,9 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info,
const char *core_path = NULL; const char *core_path = NULL;
const char *savestate_support = NULL; const char *savestate_support = NULL;
bool kiosk_mode_enable = settings->bools.kiosk_mode_enable; bool kiosk_mode_enable = settings->bools.kiosk_mode_enable;
#if !(defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
#if defined(HAVE_NETWORKING) && defined(HAVE_ONLINE_UPDATER) #if defined(HAVE_NETWORKING) && defined(HAVE_ONLINE_UPDATER)
bool menu_show_core_updater = settings->bools.menu_show_core_updater; bool menu_show_core_updater = settings->bools.menu_show_core_updater;
#endif #endif
#endif
#if defined(HAVE_DYNAMIC) #if defined(HAVE_DYNAMIC)
enum menu_contentless_cores_display_type enum menu_contentless_cores_display_type
contentless_display_type = (enum menu_contentless_cores_display_type) contentless_display_type = (enum menu_contentless_cores_display_type)
@ -766,7 +764,6 @@ end:
} }
#endif #endif
#if !(defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
if (!string_is_empty(core_path) && !kiosk_mode_enable) if (!string_is_empty(core_path) && !kiosk_mode_enable)
{ {
/* Check whether core is currently locked */ /* Check whether core is currently locked */
@ -836,7 +833,6 @@ end:
count++; count++;
#endif #endif
} }
#endif
return count; return count;
} }
@ -945,9 +941,7 @@ static unsigned menu_displaylist_parse_core_manager_list(
{ {
unsigned count = 0; unsigned count = 0;
core_info_list_t *core_info_list = NULL; core_info_list_t *core_info_list = NULL;
#if !(defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
bool kiosk_mode_enable = settings->bools.kiosk_mode_enable; bool kiosk_mode_enable = settings->bools.kiosk_mode_enable;
#endif
/* Get core list */ /* Get core list */
core_info_get_list(&core_info_list); core_info_get_list(&core_info_list);
@ -1012,7 +1006,6 @@ static unsigned menu_displaylist_parse_core_manager_list(
} }
/* Add 'sideload core' entry */ /* Add 'sideload core' entry */
#if !(defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
if (!kiosk_mode_enable) if (!kiosk_mode_enable)
if (menu_entries_append_enum(info->list, if (menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_LIST), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_LIST),
@ -1020,7 +1013,6 @@ static unsigned menu_displaylist_parse_core_manager_list(
MENU_ENUM_LABEL_SIDELOAD_CORE_LIST, MENU_ENUM_LABEL_SIDELOAD_CORE_LIST,
MENU_SETTING_ACTION, 0, 0)) MENU_SETTING_ACTION, 0, 0))
count++; count++;
#endif
return count; return count;
} }
@ -5556,7 +5548,7 @@ static void wifi_scan_callback(retro_task_t *task,
bool menu_displaylist_process(menu_displaylist_info_t *info) bool menu_displaylist_process(menu_displaylist_info_t *info)
{ {
size_t idx = 0; size_t idx = 0;
#if defined(HAVE_NETWORKING) #ifdef HAVE_NETWORKING
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#endif #endif
@ -5575,9 +5567,7 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
if (info->need_sort) if (info->need_sort)
file_list_sort_on_alt(info->list); file_list_sort_on_alt(info->list);
#if defined(HAVE_NETWORKING) #ifdef HAVE_NETWORKING
#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
#else
if (settings->bools.menu_show_core_updater && !settings->bools.kiosk_mode_enable) if (settings->bools.menu_show_core_updater && !settings->bools.kiosk_mode_enable)
{ {
if (info->download_core) if (info->download_core)
@ -5597,7 +5587,6 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
} }
} }
#endif
#endif #endif
if (info->push_builtin_cores) if (info->push_builtin_cores)
@ -13142,8 +13131,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
count++; count++;
#elif defined(HAVE_NETWORKING) #elif defined(HAVE_NETWORKING)
#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
#else
#ifdef HAVE_UPDATE_CORES #ifdef HAVE_UPDATE_CORES
if (settings->bools.menu_show_core_updater) if (settings->bools.menu_show_core_updater)
{ {
@ -13186,7 +13173,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
} }
#endif #endif
#endif
#if defined(HAVE_COMPRESSION) && !defined(HAVE_MIST) #if defined(HAVE_COMPRESSION) && !defined(HAVE_MIST)
if (menu_entries_append_enum(info->list, if (menu_entries_append_enum(info->list,