mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-15 22:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups to rarch_main - and also fix Android platform struct

Browse Source
This commit is contained in:
twinaphex 2015-04-20 20:53:17 +02:00
parent e8a8b378d5
commit 445bf04892
3 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/drivers/platform_android.c
View File

@ -869,6 +869,7 @@ const frontend_ctx_driver_t frontend_ctx_android = {
NULL, /* get_os */
frontend_android_get_rating,
NULL, /* load_content */
NULL, /* get_architecture */
NULL, /* get_powerstate */
"android",
};

33
frontend/frontend.c
View File

@ -23,20 +23,13 @@
#include <file/file_path.h>
#if defined(ANDROID)
#define returnfunc() exit(0)
#define return_var(var) return
#define declare_argc() int argc = 0;
#define declare_argv() char *argv[1]
#define args_initial_ptr() data
#else
#define returnfunc() return 0
#define return_var(var) return var
#define declare_argc()
#define declare_argv()
#define args_initial_ptr() NULL
#endif
#if !defined(__APPLE__) && !defined(EMSCRIPTEN)
@ -81,7 +74,7 @@ void main_exit_save_config(void)
* Also saves configuration files to disk,
* and (optionally) autosave state.
**/
void main_exit(args_type() args)
void main_exit(void *args)
{
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -218,7 +211,7 @@ static void history_playlist_push(content_playlist_t *playlist,
*
* Returns: false (0) if rarch_main_init failed, otherwise true (1).
**/
bool main_load_content(int argc, char **argv, args_type() args,
bool main_load_content(int argc, char **argv, void *args,
environment_get_t environ_get,
process_args_t process_args)
{
@ -287,15 +280,23 @@ error:
*
* Returns: varies per platform.
**/
returntype main_entry(signature())
#if defined(ANDROID)
void android_app_entry(void *data)
#elif defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
int rarch_main(int argc, char *argv[])
#else
int main(int argc, char *argv[])
#endif
{
declare_argc();
declare_argv();
args_type() args = (args_type())args_initial_ptr();
#ifdef ANDROID
char *argv[1];
int argc = 0;
#endif
void *args = (void *)args_initial_ptr();
int ret = 0;
settings_t *settings = NULL;
driver_t *driver = NULL;
rarch_main_alloc();
driver = driver_get_ptr();
@ -314,8 +315,8 @@ returntype main_entry(signature())
if (driver->frontend_ctx)
{
if (!(ret = (main_load_content(argc, argv, args,
driver->frontend_ctx->environment_get,
driver->frontend_ctx->process_args))))
driver->frontend_ctx->environment_get,
driver->frontend_ctx->process_args))))
{
return_var(ret);
}

27
frontend/frontend.h
View File

@ -24,21 +24,6 @@
#if defined(ANDROID)
#include "drivers/platform_android.h"
#define main_entry android_app_entry
#define args_type() struct android_app*
#define signature() void* data
#define signature_expand() data
#define returntype void
#else
#if defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
#define main_entry rarch_main
#else
#define main_entry main
#endif
#define args_type() void*
#define signature() int argc, char *argv[]
#define signature_expand() argc, argv
#define returntype int
#endif
#ifdef __cplusplus
@ -53,7 +38,7 @@ extern "C" {
* Also saves configuration files to disk,
* and (optionally) autosave state.
**/
void main_exit(args_type() args);
void main_exit(void *args);
/**
* main_exit_save_config:
@ -74,7 +59,13 @@ void main_exit_save_config(void);
*
* Returns: varies per platform.
**/
returntype main_entry(signature());
#if defined(ANDROID)
void android_app_entry(void *data);
#elif defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
int rarch_main(int argc, char *argv[]);
#else
int main(int argc, char *argv[]);
#endif
/**
* main_load_content:
@ -91,7 +82,7 @@ returntype main_entry(signature());
* Returns: false (0) if rarch_main_init failed, otherwise true (1).
**/
bool main_load_content(int argc, char **argv,
args_type() args, environment_get_t environ_get,
void *args, environment_get_t environ_get,
process_args_t process_args);
#ifdef __cplusplus