android: Change preprocessor define to standard __ANDROID__

ANDROID is only standard to the old Makefile buildsystem, not the platform.
This commit is contained in:
Florent Castelli committed 2016-10-12 11:14:09 +02:00
1 parent 4f655f8f3c
commit 70593d1004
54 files changed
+119 -123

No files matched your search

+2 -2
View File
@@ -344,7 +344,7 @@ static ConfigSetting generalSettings[] = {
ConfigSetting("CacheFullIsoInRam", &g_Config.bCacheFullIsoInRam, false, true, true),
ConfigSetting("RemoteISOPort", &g_Config.iRemoteISOPort, 0, true, false),
#ifdef ANDROID
#ifdef __ANDROID__
ConfigSetting("ScreenRotation", &g_Config.iScreenRotation, 1),
#endif
ConfigSetting("InternalScreenRotation", &g_Config.iInternalScreenRotation, 1),
@@ -411,7 +411,7 @@ static bool DefaultTimerHack() {
}
static int DefaultAndroidHwScale() {
#ifdef ANDROID
#ifdef __ANDROID__
// Get the real resolution as passed in during startup, not dp_xres and stuff
int xres = System_GetPropertyInt(SYSPROP_DISPLAY_XRES);
int yres = System_GetPropertyInt(SYSPROP_DISPLAY_YRES);