mirror of
https://github.com/libretro/RetroArch
synced 2025-02-01 00:32:46 +00:00
(Android) Fixes core library being passed from Java frontend to
native library
This commit is contained in:
parent
a61f0dfd61
commit
cc315379c5
@ -96,12 +96,6 @@ static bool android_app_start_main(struct android_app *android_app)
|
||||
strlcpy(out_args.in, "ROM", sizeof(out_args.in));
|
||||
jni_get(&in_params, &out_args);
|
||||
|
||||
// libretro
|
||||
out_args.out = g_settings.libretro;
|
||||
out_args.out_sizeof = sizeof(g_settings.libretro);
|
||||
strlcpy(out_args.in, "LIBRETRO", sizeof(out_args.in));
|
||||
jni_get(&in_params, &out_args);
|
||||
|
||||
// Config file
|
||||
out_args.out = g_extern.config_path;
|
||||
out_args.out_sizeof = sizeof(g_extern.config_path);
|
||||
@ -114,18 +108,27 @@ static bool android_app_start_main(struct android_app *android_app)
|
||||
strlcpy(out_args.in, "IME", sizeof(out_args.in));
|
||||
jni_get(&in_params, &out_args);
|
||||
|
||||
(*in_params.java_vm)->DetachCurrentThread(in_params.java_vm);
|
||||
|
||||
RARCH_LOG("Checking arguments passed ...\n");
|
||||
RARCH_LOG("ROM Filename: [%s].\n", g_extern.fullpath);
|
||||
RARCH_LOG("Libretro path: [%s].\n", g_settings.libretro);
|
||||
RARCH_LOG("Config file: [%s].\n", g_extern.config_path);
|
||||
RARCH_LOG("Current IME: [%s].\n", android_app->current_ime);
|
||||
|
||||
config_load();
|
||||
|
||||
// libretro
|
||||
out_args.out = g_settings.libretro;
|
||||
out_args.out_sizeof = sizeof(g_settings.libretro);
|
||||
strlcpy(out_args.in, "LIBRETRO", sizeof(out_args.in));
|
||||
jni_get(&in_params, &out_args);
|
||||
|
||||
RARCH_LOG("Checking arguments passed ...\n");
|
||||
RARCH_LOG("Libretro path: [%s].\n", g_settings.libretro);
|
||||
|
||||
(*in_params.java_vm)->DetachCurrentThread(in_params.java_vm);
|
||||
|
||||
menu_init();
|
||||
|
||||
|
||||
ret = load_menu_game();
|
||||
if (ret)
|
||||
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
|
||||
|
Loading…
x
Reference in New Issue
Block a user