preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-13 14:30:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

android: Change preprocessor define to standard __ANDROID__

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/KeyMap.cpp
+3 -3
View File
@@ -184,7 +184,7 @@ static const DefMappingStruct defaultShieldKeyMap[] = {
};
static const DefMappingStruct defaultPadMap[] = {
#if defined(ANDROID)
#if defined(__ANDROID__)
{CTRL_CROSS , NKCODE_BUTTON_A},
{CTRL_CIRCLE , NKCODE_BUTTON_B},
{CTRL_SQUARE , NKCODE_BUTTON_X},
@@ -289,7 +289,7 @@ void UpdateNativeMenuKeys() {
KeyFromPspButton(CTRL_LEFT, &leftKeys);
KeyFromPspButton(CTRL_RIGHT, &rightKeys);
#ifdef ANDROID
#ifdef __ANDROID__
// Hardcode DPAD on Android
upKeys.push_back(KeyDef(DEVICE_ID_ANY, NKCODE_DPAD_UP));
downKeys.push_back(KeyDef(DEVICE_ID_ANY, NKCODE_DPAD_DOWN));
@@ -835,7 +835,7 @@ void RestoreDefault() {
SetDefaultKeyMap(DEFAULT_MAPPING_KEYBOARD, true);
SetDefaultKeyMap(DEFAULT_MAPPING_X360, false);
SetDefaultKeyMap(DEFAULT_MAPPING_PAD, false);
#elif defined(ANDROID)
#elif defined(__ANDROID__)
// Autodetect a few common devices
std::string name = System_GetProperty(SYSPROP_NAME);
if (IsNvidiaShield(name) || IsNvidiaShieldTV(name)) {