From e58d9f31dda5c4b2b5f8c2935dd6d633f01c32e7 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 10 Sep 2012 01:53:42 +0200 Subject: [PATCH] (Android) Don't compile in linux_inputraw for Android - use pretro_get_system_info instead of retro_get_system_info --- console/rarch_console_rom_ext.c | 4 ++++ driver.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/console/rarch_console_rom_ext.c b/console/rarch_console_rom_ext.c index b99f659e56..dd18297976 100644 --- a/console/rarch_console_rom_ext.c +++ b/console/rarch_console_rom_ext.c @@ -50,7 +50,11 @@ 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); diff --git a/driver.c b/driver.c index 733b79cac7..4a9a1a7d3e 100644 --- a/driver.c +++ b/driver.c @@ -125,7 +125,7 @@ static const input_driver_t *input_drivers[] = { #ifdef GEKKO &input_gx, #endif -#ifdef __linux__ +#if defined(__linux__) && !defined(ANDROID) &input_linuxraw, #endif &input_null,