ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(frontend.c) Fixes for RARCH_CONSOLE

This commit is contained in:
twinaphex 2013-07-15 20:49:36 +02:00
parent 81738c952d
commit d929ef9d11
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/phoenix/.classpath
View File

@ -4,5 +4,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

18
frontend/frontend.c
View File

@ -196,22 +196,27 @@ int rarch_main(int argc, char *argv[])
rarch_main_clear_state(); rarch_main_clear_state();
rarch_get_environment(argc, argv); rarch_get_environment(argc, argv);
#ifdef HAVE_MENU
#ifdef RARCH_CONSOLE
menu_init();
system_process_args(argc, argv);
g_extern.lifecycle_mode_state |= 1ULL << MODE_LOAD_GAME;
#else
rarch_init_msg_queue(); rarch_init_msg_queue();
int init_ret; int init_ret;
if ((init_ret = rarch_main_init(argc, argv))) return init_ret; if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
#ifdef HAVE_MENU
menu_init(); menu_init();
#ifdef RARCH_CONSOLE
system_process_args(argc, argv);
#endif
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME; g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
// If we started a ROM directly from command line, // If we started a ROM directly from command line,
// push it to ROM history. // push it to ROM history.
if (!g_extern.libretro_dummy) if (!g_extern.libretro_dummy)
menu_rom_history_push_current(); menu_rom_history_push_current();
#endif
for (;;) for (;;)
{ {
@ -290,6 +295,11 @@ int rarch_main(int argc, char *argv[])
global_uninit_drivers(); global_uninit_drivers();
#endif #endif
#else #else
rarch_init_msg_queue();
int init_ret;
if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate()); while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
rarch_main_deinit(); rarch_main_deinit();
#endif #endif