mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS 9 build fix (#16980)

Browse Source
This commit is contained in:
Eric Warmenhoven 2024-09-08 10:59:19 -04:00 committed by GitHub
parent d60d320e76
commit 0d6b249dbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playlist.c
View File

@ -1144,6 +1144,7 @@ void playlist_resolve_path(enum playlist_file_mode mode,
{ {
#ifdef HAVE_COCOATOUCH #ifdef HAVE_COCOATOUCH
char tmp[PATH_MAX_LENGTH]; char tmp[PATH_MAX_LENGTH];
int _len = 0;
if (mode == PLAYLIST_LOAD) if (mode == PLAYLIST_LOAD)
{ {
@ -1159,8 +1160,8 @@ void playlist_resolve_path(enum playlist_file_mode mode,
path[string_index_last_occurance(path, '.')] = '\0'; path[string_index_last_occurance(path, '.')] = '\0';
if (string_ends_with(path, "_ios")) if (string_ends_with(path, "_ios"))
path[string_index_last_occurance(path, '_')] = '\0'; path[string_index_last_occurance(path, '_')] = '\0';
strlcpy(tmp, ":/Frameworks/", STRLEN_CONST(":/Frameworks/") + 1); _len += strlcpy(tmp + _len, ":/Frameworks/", STRLEN_CONST(":/Frameworks/") + 1);
strlcpy(tmp + STRLEN_CONST(":/Frameworks/"), path + STRLEN_CONST(":/modules/"), sizeof(tmp) - STRLEN_CONST(":/Frameworks/")); _len += strlcpy(tmp + _len, path + STRLEN_CONST(":/modules/"), sizeof(tmp) - _len);
/* iOS framework names, to quote Apple: /* iOS framework names, to quote Apple:
* "must contain only alphanumerics, dots, hyphens and must not end with a dot." * "must contain only alphanumerics, dots, hyphens and must not end with a dot."
* *
@ -1168,7 +1169,7 @@ void playlist_resolve_path(enum playlist_file_mode mode,
* which is, we change underscore to dot. * which is, we change underscore to dot.
*/ */
string_replace_all_chars(tmp, '_', '.'); string_replace_all_chars(tmp, '_', '.');
strlcat(tmp, ".framework", sizeof(tmp)); strlcpy(tmp + _len, ".framework", sizeof(tmp));
fill_pathname_expand_special(path, tmp, len); fill_pathname_expand_special(path, tmp, len);
} }
else else

2
ui/drivers/cocoa/cocoa_common.m
View File

@ -652,7 +652,7 @@ void cocoa_file_load_with_detect_core(const char *filename);
hideKeyboardSwipe.delegate = self; hideKeyboardSwipe.delegate = self;
[self.view addGestureRecognizer:hideKeyboardSwipe]; [self.view addGestureRecognizer:hideKeyboardSwipe];
#endif #endif
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 #if defined(HAVE_IOS_TOUCHMOUSE) || defined(HAVE_IOS_CUSTOMKEYBOARDS)
if (@available(iOS 13, *)) if (@available(iOS 13, *))
[self setupHelperBar]; [self setupHelperBar];
#endif #endif