mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Android ifdef outside RARCH_CONSOLE.

Browse Source
This commit is contained in:
Themaister 2013-02-17 22:30:04 +01:00
parent 145bad0b36
commit 8f046a790b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
settings.c
View File

@ -477,13 +477,6 @@ bool config_load_file(const char *path)
CONFIG_GET_INT(input.device[i], cfg); CONFIG_GET_INT(input.device[i], cfg);
} }
#ifdef ANDROID
CONFIG_GET_INT(input.icade_profile[0], "input_autodetect_icade_profile_pad1");
CONFIG_GET_INT(input.icade_profile[1], "input_autodetect_icade_profile_pad2");
CONFIG_GET_INT(input.icade_profile[2], "input_autodetect_icade_profile_pad3");
CONFIG_GET_INT(input.icade_profile[3], "input_autodetect_icade_profile_pad4");
#endif
CONFIG_GET_BOOL_EXTERN(console.screen.gamma_correction, "gamma_correction"); CONFIG_GET_BOOL_EXTERN(console.screen.gamma_correction, "gamma_correction");
bool msg_enable = false; bool msg_enable = false;
@ -699,8 +692,13 @@ bool config_load_file(const char *path)
CONFIG_GET_PATH(input.overlay, "input_overlay"); CONFIG_GET_PATH(input.overlay, "input_overlay");
CONFIG_GET_FLOAT(input.overlay_opacity, "input_overlay_opacity"); CONFIG_GET_FLOAT(input.overlay_opacity, "input_overlay_opacity");
CONFIG_GET_BOOL(input.debug_enable, "input_debug_enable"); CONFIG_GET_BOOL(input.debug_enable, "input_debug_enable");
#ifdef ANDROID #ifdef ANDROID
CONFIG_GET_BOOL(input.autodetect_enable, "input_autodetect_enable"); CONFIG_GET_BOOL(input.autodetect_enable, "input_autodetect_enable");
CONFIG_GET_INT(input.icade_profile[0], "input_autodetect_icade_profile_pad1");
CONFIG_GET_INT(input.icade_profile[1], "input_autodetect_icade_profile_pad2");
CONFIG_GET_INT(input.icade_profile[2], "input_autodetect_icade_profile_pad3");
CONFIG_GET_INT(input.icade_profile[3], "input_autodetect_icade_profile_pad4");
#endif #endif
int low_ram_mode = 0; int low_ram_mode = 0;