mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-14 22:38:34 +00:00
(RARCH_CONSOLE) Android no longer uses RARCH_CONSOLE - so we can
get rid of all ANDROID ifdefs in console-side code
This commit is contained in:
parent
11465db9c1
commit
24a7b25d6a
@ -97,8 +97,6 @@ VIDEO CONTEXT
|
||||
#include "../../gfx/context/ps3_ctx.c"
|
||||
#elif defined(_XBOX)
|
||||
#include "../../gfx/context/xdk_ctx.c"
|
||||
#elif defined(ANDROID)
|
||||
#include "../../gfx/context/androidegl_ctx.c"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@ -133,13 +131,6 @@ VIDEO IMAGE
|
||||
VIDEO DRIVER
|
||||
============================================================ */
|
||||
|
||||
#if defined(ANDROID)
|
||||
#include "../../gfx/scaler/scaler.c"
|
||||
#include "../../gfx/scaler/pixconv.c"
|
||||
#include "../../gfx/scaler/scaler_int.c"
|
||||
#include "../../gfx/scaler/filter.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_OPENGL)
|
||||
#include "../../gfx/math/matrix.c"
|
||||
#include "../../gfx/gl.c"
|
||||
|
@ -29,11 +29,7 @@ void rarch_console_name_from_id(char *name, size_t size)
|
||||
return;
|
||||
|
||||
struct retro_system_info info;
|
||||
#ifdef ANDROID
|
||||
pretro_get_system_info(&info);
|
||||
#else
|
||||
retro_get_system_info(&info);
|
||||
#endif
|
||||
const char *id = info.library_name ? info.library_name : "Unknown";
|
||||
|
||||
if (!id || strlen(id) >= size)
|
||||
|
@ -50,11 +50,7 @@ void rarch_console_load_game_wrap(const char *path, unsigned extract_zip_mode, u
|
||||
bool extract_zip_and_load_game_cond = false;
|
||||
bool load_game = !extract_zip_cond;
|
||||
|
||||
#ifdef ANDROID
|
||||
pretro_get_system_info(&info);
|
||||
#else
|
||||
retro_get_system_info(&info);
|
||||
#endif
|
||||
block_zip_extract = info.block_extract;
|
||||
|
||||
snprintf(rom_path_temp, sizeof(rom_path_temp), path);
|
||||
@ -96,11 +92,7 @@ const char *rarch_console_get_rom_ext(void)
|
||||
const char *retval = NULL;
|
||||
|
||||
struct retro_system_info info;
|
||||
#ifdef ANDROID
|
||||
pretro_get_system_info(&info);
|
||||
#else
|
||||
retro_get_system_info(&info);
|
||||
#endif
|
||||
|
||||
if (info.valid_extensions)
|
||||
retval = info.valid_extensions;
|
||||
|
Loading…
Reference in New Issue
Block a user