github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-07 20:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc: Android build fixes

Browse Source
This commit is contained in:
Stenzek 2024-10-28 23:12:54 +10:00
parent bfadd608fb
commit a3d55c6e30
No known key found for this signature in database
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/fullscreen_ui.h
View File

@ -47,6 +47,9 @@ void TimeToPrintableString(SmallStringBase* str, time_t t);
// Host UI triggers from Big Picture mode. // Host UI triggers from Big Picture mode.
namespace Host { namespace Host {
#ifndef __ANDROID__
/// Requests shut down and exit of the hosting application. This may not actually exit, /// Requests shut down and exit of the hosting application. This may not actually exit,
/// if the user cancels the shutdown confirmation. /// if the user cancels the shutdown confirmation.
void RequestExitApplication(bool allow_confirm); void RequestExitApplication(bool allow_confirm);
@ -56,4 +59,7 @@ void RequestExitBigPicture();
/// Requests the cover downloader be opened. /// Requests the cover downloader be opened.
void OnCoverDownloaderOpenRequested(); void OnCoverDownloaderOpenRequested();
#endif
} // namespace Host } // namespace Host

4
src/core/imgui_overlays.cpp
View File

@ -76,6 +76,8 @@ static void DrawFrameTimeOverlay(float& position_y, float scale, float margin, f
static void DrawEnhancementsOverlay(); static void DrawEnhancementsOverlay();
static void DrawInputsOverlay(); static void DrawInputsOverlay();
#ifndef __ANDROID__
static constexpr size_t NUM_DEBUG_WINDOWS = 6; static constexpr size_t NUM_DEBUG_WINDOWS = 6;
static constexpr const char* DEBUG_WINDOW_CONFIG_SECTION = "DebugWindows"; static constexpr const char* DEBUG_WINDOW_CONFIG_SECTION = "DebugWindows";
static constexpr const std::array<DebugWindowInfo, NUM_DEBUG_WINDOWS> s_debug_window_info = {{ static constexpr const std::array<DebugWindowInfo, NUM_DEBUG_WINDOWS> s_debug_window_info = {{
@ -87,6 +89,8 @@ static constexpr const std::array<DebugWindowInfo, NUM_DEBUG_WINDOWS> s_debug_wi
{"Timers", "Timers State", ":icons/applications-system.png", &Timers::DrawDebugStateWindow, 800, 95}, {"Timers", "Timers State", ":icons/applications-system.png", &Timers::DrawDebugStateWindow, 800, 95},
}}; }};
static std::array<ImGuiManager::AuxiliaryRenderWindowState, NUM_DEBUG_WINDOWS> s_debug_window_state = {}; static std::array<ImGuiManager::AuxiliaryRenderWindowState, NUM_DEBUG_WINDOWS> s_debug_window_state = {};
#endif
} // namespace ImGuiManager } // namespace ImGuiManager
static std::tuple<float, float> GetMinMax(std::span<const float> values) static std::tuple<float, float> GetMinMax(std::span<const float> values)

4
src/core/settings.cpp
View File

@ -1025,7 +1025,11 @@ void Settings::FixIncompatibleSettings(bool display_osd_messages)
g_settings.cpu_overclock_enable = false; g_settings.cpu_overclock_enable = false;
g_settings.UpdateOverclockActive(); g_settings.UpdateOverclockActive();
} }
#ifndef __ANDROID__
g_settings.debugging.enable_gdb_server = false; g_settings.debugging.enable_gdb_server = false;
#endif
g_settings.debugging.show_vram = false; g_settings.debugging.show_vram = false;
g_settings.debugging.dump_cpu_to_vram_copies = false; g_settings.debugging.dump_cpu_to_vram_copies = false;
g_settings.debugging.dump_vram_to_cpu_copies = false; g_settings.debugging.dump_vram_to_cpu_copies = false;