From 43b79f34c90d706738b705dfd7fd4bcb0df7e87f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 May 2014 00:07:15 +0200 Subject: [PATCH] (Lakka) ROM/core loading - add codepath for targets that don't have HAVE_DYNAMIC defined as well --- Makefile | 2 ++ frontend/menu/backend/menu_lakka_backend.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index d66054369c..5ad6006d68 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ include config.mk +HAVE_LAKKA = 1 +DEFINES += -DHAVE_LAKKA=1 TARGET = retroarch tools/retroarch-joyconfig tools/retrolaunch/retrolaunch diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index fc51f3806e..9b99e1f18d 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -105,7 +105,14 @@ static int menu_lakka_iterate(void *data, unsigned action) { strlcpy(g_extern.fullpath, categories[menu_active_category].items[categories[menu_active_category].active_item].rom, sizeof(g_extern.fullpath)); strlcpy(g_settings.libretro, categories[menu_active_category].libretro, sizeof(g_settings.libretro)); + +#ifdef HAVE_DYNAMIC + menu_update_system_info(rgui, &rgui->load_no_rom); g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME); +#else + rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)g_settings.libretro); + rarch_environment_cb(RETRO_ENVIRONMENT_EXEC, (void*)g_extern.fullpath); +#endif } return -1; break;