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

Move some RARCH_CONSOLE stuff around.

This commit is contained in:
Themaister 2013-01-08 23:22:08 +01:00
parent 1fb34c9dd5
commit 5bf9eeb802
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/frontend_console.c
View File

@ -31,11 +31,13 @@
#undef main #undef main
int rarch_console_preinit(void); // Only called once on init and deinit.
// Video and input drivers need to be active (owned)
// before retroarch core starts.
static void init_console_drivers(void) static void init_console_drivers(void)
{ {
driver.video->start(); init_drivers_pre(); // Set driver.* function callbacks.
driver.video->start(); // Statically starts video driver. Sets driver.video_data.
driver.input_data = driver.input->init(); driver.input_data = driver.input->init();
rarch_input_set_controls_default(driver.input); rarch_input_set_controls_default(driver.input);
driver.input->post_init(); driver.input->post_init();
@ -69,7 +71,9 @@ int main(int argc, char *argv[])
rarch_settings_set_default(); rarch_settings_set_default();
rarch_config_load(); rarch_config_load();
rarch_console_preinit(); config_load();
init_libretro_sym();
init_system_info();
init_console_drivers(); init_console_drivers();

32
retroarch.c
View File

@ -2643,38 +2643,6 @@ static void validate_cpu_features(void)
#endif #endif
} }
#ifdef RARCH_CONSOLE
int rarch_console_preinit(void)
{
init_state();
if (g_extern.verbose)
{
RARCH_LOG_OUTPUT("=== Build =======================================");
print_compiler(stderr);
RARCH_LOG_OUTPUT("=================================================\n");
}
validate_cpu_features();
config_load();
init_libretro_sym();
init_system_info();
init_drivers_pre();
return 0;
#if 0
error:
pretro_deinit();
uninit_libretro_sym();
return 1;
#endif
}
#endif
int rarch_main_init(int argc, char *argv[]) int rarch_main_init(int argc, char *argv[])
{ {
init_state(); init_state();