mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 12:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(frontend) Cleanups to frontend.c

Browse Source
This commit is contained in:
twinaphex 2013-07-28 20:57:49 +02:00
parent 4888dc51c4
commit 56974007ad
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/frontend.c
View File

@ -81,7 +81,6 @@ void rarch_make_dir(const char *x, const char *name)
} }
} }
} }
#endif #endif
static void rarch_get_environment(int argc, char *argv[]) static void rarch_get_environment(int argc, char *argv[])
@ -139,10 +138,10 @@ static void rarch_get_environment(int argc, char *argv[])
#endif #endif
} }
#if defined(__APPLE__) #if defined(IOS) || defined(OSX)
void* rarch_main(void* args) void* rarch_main(void* args)
#else #else
int rarch_main(int argc, char *argv[]) int main(int argc, char *argv[])
#endif #endif
{ {
frontend_ctx = (frontend_ctx_driver_t*)frontend_ctx_init_first(); frontend_ctx = (frontend_ctx_driver_t*)frontend_ctx_init_first();
@ -277,17 +276,14 @@ int rarch_main(int argc, char *argv[])
config_save_keybinds(g_extern.input_config_path); config_save_keybinds(g_extern.input_config_path);
#endif #endif
if (g_extern.main_is_init)
rarch_main_deinit();
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
global_uninit_drivers(); global_uninit_drivers();
#endif #endif
#else #else
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();
#endif #endif
rarch_main_deinit();
rarch_deinit_msg_queue(); rarch_deinit_msg_queue();
#ifdef PERF_TEST #ifdef PERF_TEST
@ -316,10 +312,3 @@ int rarch_main(int argc, char *argv[])
return 0; return 0;
} }
#ifndef __APPLE__
int main(int argc, char *argv[])
{
return rarch_main(argc, argv);
}
#endif

2
frontend/platform/platform_ps3.c
View File

@ -439,8 +439,10 @@ static void system_exec(const char *path, bool should_load_game)
RARCH_LOG("Attempt to load executable: [%s].\n", path); RARCH_LOG("Attempt to load executable: [%s].\n", path);
char spawn_data[256]; char spawn_data[256];
#ifndef IS_SALAMANDER
char game_path[256]; char game_path[256];
game_path[0] = '\0'; game_path[0] = '\0';
#endif
for(unsigned int i = 0; i < sizeof(spawn_data); ++i) for(unsigned int i = 0; i < sizeof(spawn_data); ++i)
spawn_data[i] = i & 0xff; spawn_data[i] = i & 0xff;