diff options
Diffstat (limited to 'src/frontend_common')
| -rw-r--r-- | src/frontend_common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/frontend_common/config.cpp | 2 | ||||
| -rw-r--r-- | src/frontend_common/config.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/frontend_common/CMakeLists.txt b/src/frontend_common/CMakeLists.txt index 1537271fc..22e9337c4 100644 --- a/src/frontend_common/CMakeLists.txt +++ b/src/frontend_common/CMakeLists.txt @@ -7,4 +7,4 @@ add_library(frontend_common STATIC ) create_target_directory_groups(frontend_common) -target_link_libraries(frontend_common PUBLIC core SimpleIni PRIVATE common Boost::headers) +target_link_libraries(frontend_common PUBLIC core SimpleIni::SimpleIni PRIVATE common Boost::headers) diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp index 7474cb0f9..1a0491c2c 100644 --- a/src/frontend_common/config.cpp +++ b/src/frontend_common/config.cpp @@ -924,12 +924,14 @@ std::string Config::AdjustOutputString(const std::string& string) { // Windows requires that two forward slashes are used at the start of a path for unmapped // network drives so we have to watch for that here +#ifndef ANDROID if (string.substr(0, 2) == "//") { boost::replace_all(adjusted_string, "//", "/"); adjusted_string.insert(0, "/"); } else { boost::replace_all(adjusted_string, "//", "/"); } +#endif // Needed for backwards compatibility with QSettings deserialization for (const auto& special_character : special_characters) { diff --git a/src/frontend_common/config.h b/src/frontend_common/config.h index 20a1a8056..b3812af17 100644 --- a/src/frontend_common/config.h +++ b/src/frontend_common/config.h @@ -7,6 +7,7 @@ #include <string> #include "common/settings.h" +#define SI_NO_CONVERSION #include <SimpleIni.h> #include <boost/algorithm/string/replace.hpp> |