Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-29 19:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GameList: Fix building on 32-bit ARM

Browse source
This commit is contained in:
Connor McLaughlin 2022-08-16 21:22:59 +10:00
parent 16d15f5c65
commit 2703880d69
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/frontend-common/common_host.cpp
View file

@ -273,14 +273,17 @@ void CommonHost::SetDefaultControllerSettings(SettingsInterface& si)
si.SetStringValue(section.c_str(), "Type", Controller::GetDefaultPadType(i)); si.SetStringValue(section.c_str(), "Type", Controller::GetDefaultPadType(i));
} }
#ifndef __ANDROID__
// Use the automapper to set this up. // Use the automapper to set this up.
InputManager::MapController(si, 0, InputManager::GetGenericBindingMapping("Keyboard")); InputManager::MapController(si, 0, InputManager::GetGenericBindingMapping("Keyboard"));
#endif
} }
void CommonHost::SetDefaultHotkeyBindings(SettingsInterface& si) void CommonHost::SetDefaultHotkeyBindings(SettingsInterface& si)
{ {
si.ClearSection("Hotkeys"); si.ClearSection("Hotkeys");
#ifndef __ANDROID__
si.SetStringValue("Hotkeys", "FastForward", "Keyboard/Tab"); si.SetStringValue("Hotkeys", "FastForward", "Keyboard/Tab");
si.SetStringValue("Hotkeys", "TogglePause", "Keyboard/Space"); si.SetStringValue("Hotkeys", "TogglePause", "Keyboard/Space");
si.SetStringValue("Hotkeys", "ToggleFullscreen", "Keyboard/Alt & Keyboard/Return"); 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", "SaveSelectedSaveState", "Keyboard/F2");
si.SetStringValue("Hotkeys", "SelectPreviousSaveStateSlot", "Keyboard/F3"); si.SetStringValue("Hotkeys", "SelectPreviousSaveStateSlot", "Keyboard/F3");
si.SetStringValue("Hotkeys", "SelectNextSaveStateSlot", "Keyboard/F4"); si.SetStringValue("Hotkeys", "SelectNextSaveStateSlot", "Keyboard/F4");
#endif
} }
void CommonHost::LoadSettings(SettingsInterface& si, std::unique_lock<std::mutex>& lock) void CommonHost::LoadSettings(SettingsInterface& si, std::unique_lock<std::mutex>& lock)

4
src/frontend-common/game_list.h
View file

@ -47,8 +47,6 @@ struct Entry
size_t GetReleaseDateString(char* buffer, size_t buffer_size) const; size_t GetReleaseDateString(char* buffer, size_t buffer_size) const;
ALWAYS_INLINE bool IsDisc() const { return (type == EntryType::Disc); } ALWAYS_INLINE bool IsDisc() const { return (type == EntryType::Disc); }
static_assert(sizeof(std::time_t) == sizeof(u64));
}; };
const char* GetEntryTypeName(EntryType type); const char* GetEntryTypeName(EntryType type);
@ -85,4 +83,4 @@ void RefreshGameListAsync(bool invalidate_cache);
/// Cancels game list refresh, if there is one in progress. /// Cancels game list refresh, if there is one in progress.
void CancelGameListRefresh(); void CancelGameListRefresh();
} // namespace Host } // namespace Host