Fix some warnings for possible Android build

5 files changed, 31 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e067e85..14de39ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,10 +279,16 @@ include_directories("./${INC_DIR}")
 
 file(GLOB_RECURSE MAIN_FILE "${SRC_DIR}/SSVOpenHexagon/*/main.cpp")
 
-file(GLOB_RECURSE SRC_LIST
-     "${INC_DIR}/SSVOpenHexagon/*"
-     "${SRC_DIR}/SSVOpenHexagon/*"
-     "public/discord/*")
+if(NOT SSVOH_ANDROID)
+    file(GLOB_RECURSE SRC_LIST
+        "${INC_DIR}/SSVOpenHexagon/*"
+        "${SRC_DIR}/SSVOpenHexagon/*"
+        "public/discord/*")
+else()
+    file(GLOB_RECURSE SRC_LIST
+        "${INC_DIR}/SSVOpenHexagon/*"
+        "${SRC_DIR}/SSVOpenHexagon/*")
+endif()
 
 file(GLOB_RECURSE C_SRC_LIST
      "public/sqlite/*.c")
diff --git a/src/SSVOpenHexagon/Core/Discord.cpp b/src/SSVOpenHexagon/Core/Discord.cpp
index ee3a50c8..2d9381b6 100644
--- a/src/SSVOpenHexagon/Core/Discord.cpp
+++ b/src/SSVOpenHexagon/Core/Discord.cpp
@@ -210,7 +210,8 @@ bool discord_manager::set_rich_presence_on_replay()
 }

 

 bool discord_manager::set_rich_presence_in_game(

-    const std::string& level_info, const std::string& second_info, bool dead)

+    [[maybe_unused]] const std::string& level_info,

+    [[maybe_unused]] const std::string& second_info, [[maybe_unused]] bool dead)

 {

     return false;

 }

diff --git a/src/SSVOpenHexagon/Core/HGUpdate.cpp b/src/SSVOpenHexagon/Core/HGUpdate.cpp
index 995e9e09..410079af 100644
--- a/src/SSVOpenHexagon/Core/HGUpdate.cpp
+++ b/src/SSVOpenHexagon/Core/HGUpdate.cpp
@@ -985,6 +985,7 @@ void HexagonGame::updateTrailParticles(ssvu::FT mFT)
     }
 }
 
+#ifndef SSVOH_ANDROID
 static int ilcTextEditCallbackStub(ImGuiInputTextCallbackData* data)
 {
     auto hg = (HexagonGame*)data->UserData;
@@ -1013,8 +1014,10 @@ static int Strnicmp(const char* s1, const char* s2, int n)
     }
     return d;
 }
+#endif
 
-int HexagonGame::ilcTextEditCallback(ImGuiInputTextCallbackData* data)
+int HexagonGame::ilcTextEditCallback(
+    [[maybe_unused]] ImGuiInputTextCallbackData* data)
 {
 #ifndef SSVOH_ANDROID
     switch(data->EventFlag)
diff --git a/src/SSVOpenHexagon/Core/Steam.cpp b/src/SSVOpenHexagon/Core/Steam.cpp
index 7bff541f..2533d106 100644
--- a/src/SSVOpenHexagon/Core/Steam.cpp
+++ b/src/SSVOpenHexagon/Core/Steam.cpp
@@ -954,20 +954,9 @@ steam_manager::get_ticket_steam_id() const noexcept
 
 #else
 
-namespace hg::Steam
-
-    [[nodiscard]] const steam_manager::steam_manager_impl&
-    steam_manager::impl() const noexcept
-{
-    SSVOH_ASSERT(false);
-    return nullptr;
-}
+namespace hg::Steam {
 
-[[nodiscard]] steam_manager::steam_manager_impl& steam_manager::impl() noexcept
-{
-    SSVOH_ASSERT(false);
-    return nullptr;
-}
+class steam_manager::steam_manager_impl { };
 
 steam_manager::steam_manager() : _impl{nullptr}
 {}
@@ -994,7 +983,7 @@ bool steam_manager::store_stats()
     return false;
 }
 
-bool steam_manager::unlock_achievement(std::string_view name)
+bool steam_manager::unlock_achievement([[maybe_unused]] std::string_view name)
 {
     return false;
 }
@@ -1005,24 +994,27 @@ bool steam_manager::set_rich_presence_in_menu()
 }
 
 bool steam_manager::set_rich_presence_in_game(
-    std::string_view level_name_format, std::string_view difficulty_mult_format,
-    std::string_view time_format)
+    [[maybe_unused]] std::string_view level_name_format,
+    [[maybe_unused]] std::string_view difficulty_mult_format,
+    [[maybe_unused]] std::string_view time_format)
 {
     return false;
 }
 
-bool steam_manager::set_and_store_stat(std::string_view name, int data)
+bool steam_manager::set_and_store_stat(
+    [[maybe_unused]] std::string_view name, [[maybe_unused]] int data)
 {
     return false;
 }
 
 [[nodiscard]] bool steam_manager::get_achievement(
-    bool* out, std::string_view name)
+    [[maybe_unused]] bool* out, [[maybe_unused]] std::string_view name)
 {
     return false;
 }
 
-[[nodiscard]] bool steam_manager::get_stat(int* out, std::string_view name)
+[[nodiscard]] bool steam_manager::get_stat(
+    [[maybe_unused]] int* out, [[maybe_unused]] std::string_view name)
 {
     return false;
 }
@@ -1033,7 +1025,7 @@ bool steam_manager::update_hardcoded_achievements()
 }
 
 void steam_manager::for_workshop_pack_folders(
-    const std::function<void(const std::string&)>& f) const
+    [[maybe_unused]] const std::function<void(const std::string&)>& f) const
 {}
 
 bool steam_manager::request_encrypted_app_ticket()
diff --git a/src/SSVOpenHexagon/Global/Imgui.cpp b/src/SSVOpenHexagon/Global/Imgui.cpp
index 2c6833f7..639e16f7 100644
--- a/src/SSVOpenHexagon/Global/Imgui.cpp
+++ b/src/SSVOpenHexagon/Global/Imgui.cpp
@@ -15,7 +15,7 @@
 
 namespace hg::Imgui {
 
-void initialize(sf::RenderWindow& window)
+void initialize([[maybe_unused]] sf::RenderWindow& window)
 {
 #ifndef SSVOH_ANDROID
     ImGui::SFML::Init(window);
@@ -47,14 +47,14 @@ void shutdown()
 #endif
 }
 
-void processEvent(const sf::Event& event)
+void processEvent([[maybe_unused]] const sf::Event& event)
 {
 #ifndef SSVOH_ANDROID
     ImGui::SFML::ProcessEvent(event);
 #endif
 }
 
-void render(sf::RenderTarget& renderTarget)
+void render([[maybe_unused]] sf::RenderTarget& renderTarget)
 {
 #ifndef SSVOH_ANDROID
     ImGui::SFML::Render(renderTarget);