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

Merge pull request #12173 from crystalct/master

Browse Source 
Some PSL1GHT fixes
This commit is contained in:
Autechre 2021-03-29 09:26:24 +02:00 committed by GitHub
commit ba7900a3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.psl1ght
View File

@ -27,13 +27,13 @@ ELF_TARGET := retroarch_psl1ght.elf
SELF_TARGET := $(ELF_TARGET:.elf=.self)
CORE_PATH = pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF
INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude -Idefines
LIBDIRS += -L.
MACHDEP := -D__PSL1GHT__ -mcpu=cell
CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
LDFLAGS := $(MACHDEP)
LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl -lsysfs
# system platform
system_platform = unix

18
menu/menu_setting.c
View File

@ -11068,7 +11068,7 @@ static bool setting_append_list(
menu_settings_list_current_add_range(list, list_info, 5, 100, 5, true, true);
}
#if defined(HAVE_THREADS)
#if defined(HAVE_THREADS) && !defined(__PSL1GHT__) && !defined(__PS3__)
CONFIG_BOOL(
list, list_info,
video_driver_get_threaded(),
@ -19505,22 +19505,6 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
(void)subgroup_info;
(void)global;
#if !defined(__PSL1GHT__) && defined(__PS3__)
CONFIG_BOOL(
list, list_info,
&global->console.screen.pal60_enable,
MENU_ENUM_LABEL_PAL60_ENABLE,
MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
false,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
group_info,
subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
#endif
#if defined(GEKKO) || defined(_XBOX360)
CONFIG_UINT(
list, list_info,

23
tasks/task_pl_thumbnail_download.c
View File

@ -89,7 +89,11 @@ static bool get_thumbnail_paths(
char *path, size_t path_size,
char *url, size_t url_size)
{
#if defined(__PSL1GHT__) || defined(__PS3__)
char *raw_url;
#else
char raw_url[8192];
#endif
char content_dir[PATH_MAX_LENGTH];
char tmp_buf[PATH_MAX_LENGTH];
const char *system = NULL;
@ -99,7 +103,6 @@ static bool get_thumbnail_paths(
const char *system_name = NULL;
content_dir[0] = '\0';
raw_url[0] = '\0';
tmp_buf[0] = '\0';
if (!pl_thumb->thumbnail_path_data)
@ -150,6 +153,14 @@ static bool get_thumbnail_paths(
if (string_is_empty(path))
return false;
#if defined(__PSL1GHT__) || defined(__PS3__)
raw_url = (char*)malloc(8192 * sizeof(char));
if (!raw_url)
return false;
#endif
raw_url[0] = '\0';
/* Generate remote path */
snprintf(raw_url, sizeof(raw_url), "%s/%s/%s/%s",
FILE_PATH_CORE_THUMBNAILS_URL,
@ -159,9 +170,19 @@ static bool get_thumbnail_paths(
);
if (string_is_empty(raw_url))
#if defined(__PSL1GHT__) || defined(__PS3__)
{
free(raw_url);
return false;
}
#else
return false;
#endif
net_http_urlencode_full(url, raw_url, url_size);
#if defined(__PSL1GHT__) || defined(__PS3__)
free(raw_url);
#endif
if (string_is_empty(url))
return false;