From 2703880d693fc2e93512f9d39db4f5dbeaf386cc Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 16 Aug 2022 21:22:59 +1000 Subject: [PATCH] GameList: Fix building on 32-bit ARM --- src/frontend-common/common_host.cpp | 4 ++++ src/frontend-common/game_list.h | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/frontend-common/common_host.cpp b/src/frontend-common/common_host.cpp index e7bf5a3a8..9b43e93ed 100644 --- a/src/frontend-common/common_host.cpp +++ b/src/frontend-common/common_host.cpp @@ -273,14 +273,17 @@ void CommonHost::SetDefaultControllerSettings(SettingsInterface& si) si.SetStringValue(section.c_str(), "Type", Controller::GetDefaultPadType(i)); } +#ifndef __ANDROID__ // Use the automapper to set this up. InputManager::MapController(si, 0, InputManager::GetGenericBindingMapping("Keyboard")); +#endif } void CommonHost::SetDefaultHotkeyBindings(SettingsInterface& si) { si.ClearSection("Hotkeys"); +#ifndef __ANDROID__ si.SetStringValue("Hotkeys", "FastForward", "Keyboard/Tab"); si.SetStringValue("Hotkeys", "TogglePause", "Keyboard/Space"); si.SetStringValue("Hotkeys", "ToggleFullscreen", "Keyboard/Alt & Keyboard/Return"); @@ -291,6 +294,7 @@ void CommonHost::SetDefaultHotkeyBindings(SettingsInterface& si) si.SetStringValue("Hotkeys", "SaveSelectedSaveState", "Keyboard/F2"); si.SetStringValue("Hotkeys", "SelectPreviousSaveStateSlot", "Keyboard/F3"); si.SetStringValue("Hotkeys", "SelectNextSaveStateSlot", "Keyboard/F4"); +#endif } void CommonHost::LoadSettings(SettingsInterface& si, std::unique_lock& lock) diff --git a/src/frontend-common/game_list.h b/src/frontend-common/game_list.h index 2d9370850..a6ff70c06 100644 --- a/src/frontend-common/game_list.h +++ b/src/frontend-common/game_list.h @@ -47,8 +47,6 @@ struct Entry size_t GetReleaseDateString(char* buffer, size_t buffer_size) const; ALWAYS_INLINE bool IsDisc() const { return (type == EntryType::Disc); } - - static_assert(sizeof(std::time_t) == sizeof(u64)); }; const char* GetEntryTypeName(EntryType type); @@ -85,4 +83,4 @@ void RefreshGameListAsync(bool invalidate_cache); /// Cancels game list refresh, if there is one in progress. void CancelGameListRefresh(); -} // namespace Host \ No newline at end of file +} // namespace Host