libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Make LAKKA_PROJECT unneeded

Browse Source
This commit is contained in:
Jean-André Santoni 2016-11-15 10:18:21 +01:00
parent 1470f8da5b
commit 10d925e189
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -507,7 +507,6 @@ endif
ifeq ($(HAVE_LAKKA), 1) ifeq ($(HAVE_LAKKA), 1)
DEFINES += -DHAVE_LAKKA DEFINES += -DHAVE_LAKKA
DEFINES += -DLAKKA_PROJECT=$(LAKKA_PROJECT)
endif endif
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)

18
menu/cbs/menu_cbs_ok.c
View File

@ -82,6 +82,20 @@ size_t hack_shader_pass = 0;
char *core_buf; char *core_buf;
size_t core_len; size_t core_len;
char lakka_project[128];
static char * lakka_get_project()
{
FILE *command_file = NULL;
command_file = popen("cat /etc/release | cut -d - -f 1", "r");
fgets(lakka_project, sizeof(lakka_project), command_file);
size_t len = strlen(lakka_project);
if (len > 0 && lakka_project[len-1] == '\n')
lakka_project[--len] = '\0';
pclose(command_file);
return lakka_project;
}
static void cb_net_generic_subdir(void *task_data, void *user_data, const char *err) static void cb_net_generic_subdir(void *task_data, void *user_data, const char *err)
{ {
char subdir_path[PATH_MAX_LENGTH]; char subdir_path[PATH_MAX_LENGTH];
@ -2107,7 +2121,7 @@ static int generic_action_ok_network(const char *path,
/* TODO unhardcode this path */ /* TODO unhardcode this path */
fill_pathname_join(url_path, fill_pathname_join(url_path,
file_path_str(FILE_PATH_LAKKA_URL), file_path_str(FILE_PATH_LAKKA_URL),
LAKKA_PROJECT, sizeof(url_path)); lakka_get_project(), sizeof(url_path));
fill_pathname_join(url_path, url_path, fill_pathname_join(url_path, url_path,
file_path_str(FILE_PATH_INDEX_URL), file_path_str(FILE_PATH_INDEX_URL),
sizeof(url_path)); sizeof(url_path));
@ -2376,7 +2390,7 @@ static int action_ok_download_generic(const char *path,
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
/* TODO unhardcode this path*/ /* TODO unhardcode this path*/
fill_pathname_join(s, file_path_str(FILE_PATH_LAKKA_URL), fill_pathname_join(s, file_path_str(FILE_PATH_LAKKA_URL),
LAKKA_PROJECT, sizeof(s)); lakka_get_project(), sizeof(s));
#endif #endif
break; break;
case MENU_ENUM_LABEL_CB_UPDATE_ASSETS: case MENU_ENUM_LABEL_CB_UPDATE_ASSETS: