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

(BlackBerry) Fixup frontend for BB10 from merge.

Browse Source
This commit is contained in:
CatalystG 2013-08-09 22:47:09 -04:00
parent c99eb33c99
commit 99af806505
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blackberry-qnx/bb10/bar-descriptor.xml
View File

@ -69,7 +69,7 @@
<asset path="../../media/overlays">overlays</asset> <asset path="../../media/overlays">overlays</asset>
<asset path="assets">assets</asset> <asset path="assets">assets</asset>
<asset path="assets/images/icon.png">icon.png</asset> <asset path="assets/images/icon.png">icon.png</asset>
<asset path="../../ios/modules">lib</asset> <asset path="../../apple/modules">lib</asset>
<!-- Bright theme is used for this application. --> <!-- Bright theme is used for this application. -->

13
frontend/frontend.c
View File

@ -140,6 +140,8 @@ static void rarch_get_environment(int argc, char *argv[])
#if defined(IOS) || defined(OSX) #if defined(IOS) || defined(OSX)
void* rarch_main(void* args) void* rarch_main(void* args)
#elif defined(HAVE_BB10)
int rarch_main(int argc, char *argv[])
#else #else
int main(int argc, char *argv[]) int main(int argc, char *argv[])
#endif #endif
@ -149,12 +151,15 @@ int main(int argc, char *argv[])
if (frontend_ctx && frontend_ctx->init) if (frontend_ctx && frontend_ctx->init)
frontend_ctx->init(); frontend_ctx->init();
#ifndef HAVE_BB10
rarch_main_clear_state(); rarch_main_clear_state();
#endif
#ifndef __APPLE__ #ifndef __APPLE__
rarch_get_environment(argc, argv); rarch_get_environment(argc, argv);
#endif #endif
#if !defined(RARCH_CONSOLE) #if !defined(RARCH_CONSOLE) && !defined(HAVE_BB10)
#if defined(__APPLE__) #if defined(__APPLE__)
struct rarch_main_wrap* argdata = (struct rarch_main_wrap*)args; struct rarch_main_wrap* argdata = (struct rarch_main_wrap*)args;
int init_ret = rarch_main_init_wrap(argdata); int init_ret = rarch_main_init_wrap(argdata);
@ -173,7 +178,7 @@ int main(int argc, char *argv[])
#endif #endif
#endif #endif
#ifdef HAVE_MENU #if defined(HAVE_MENU) || defined(HAVE_BB10)
menu_init(); menu_init();
#ifndef __APPLE__ #ifndef __APPLE__
@ -181,13 +186,13 @@ int main(int argc, char *argv[])
frontend_ctx->process_args(argc, argv); frontend_ctx->process_args(argc, argv);
#endif #endif
#ifdef RARCH_CONSOLE #if defined(RARCH_CONSOLE) || defined(HAVE_BB10)
g_extern.lifecycle_mode_state |= 1ULL << MODE_LOAD_GAME; g_extern.lifecycle_mode_state |= 1ULL << MODE_LOAD_GAME;
#else #else
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME; g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
#endif #endif
#ifndef RARCH_CONSOLE #if !defined(RARCH_CONSOLE) && !defined(HAVE_BB10)
// 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)