diff options
| author | Franco M <francomaro@gmail.com> | 2023-11-04 21:28:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 21:28:16 -0300 |
| commit | 728aca770317b3f86961c8669ba9ae5c68570d3f (patch) | |
| tree | 29adffcb1d264cc16cacb478a8f6645ef6259b3b /src/common/string_util.cpp | |
| parent | 7f62a48ab507d3874378c10944662d5b841c6c2e (diff) | |
| parent | 940618a64dc048790291e240dca6a085a4f1c27c (diff) | |
Merge branch 'master' into new-shortcut
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 4c7aba3f5..72c481798 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -14,6 +14,10 @@ #include <windows.h> #endif +#ifdef ANDROID +#include <common/fs/fs_android.h> +#endif + namespace Common { /// Make a string lowercase @@ -63,6 +67,14 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _ if (full_path.empty()) return false; +#ifdef ANDROID + if (full_path[0] != '/') { + *_pPath = Common::FS::Android::GetParentDirectory(full_path); + *_pFilename = Common::FS::Android::GetFilename(full_path); + return true; + } +#endif + std::size_t dir_end = full_path.find_last_of("/" // windows needs the : included for something like just "C:" to be considered a directory #ifdef _WIN32 |