diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-21 21:46:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-22 02:56:50 +0300 |
| commit | 45fc7dfe871e25c913deb56063ca930dafe8b9ae (patch) | |
| tree | 0ef15c4d3d36b02e41f8bfa765f5fadee779af24 /src/utils | |
| parent | 6e6d42af899c7dcc05b20b07130d0b1a5932f9bf (diff) | |
| download | manaverse-45fc7dfe871e25c913deb56063ca930dafe8b9ae.tar.gz manaverse-45fc7dfe871e25c913deb56063ca930dafe8b9ae.tar.bz2 manaverse-45fc7dfe871e25c913deb56063ca930dafe8b9ae.tar.xz manaverse-45fc7dfe871e25c913deb56063ca930dafe8b9ae.zip | |
fix compilation and partial running with SDL2 on Android.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/mkdir.cpp | 6 | ||||
| -rw-r--r-- | src/utils/paths.cpp | 13 | ||||
| -rw-r--r-- | src/utils/paths.h | 4 | ||||
| -rw-r--r-- | src/utils/process.cpp | 6 |
4 files changed, 29 insertions, 0 deletions
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp index d61fae919..d4005f4ab 100644 --- a/src/utils/mkdir.cpp +++ b/src/utils/mkdir.cpp @@ -40,6 +40,9 @@ #if defined WIN32 int mkdir_r(const char *const pathname) { + if (!pathname) + return -1; + char tmp[PATH_MAX]; char tmp2[PATH_MAX]; char *p; @@ -111,6 +114,9 @@ int mkdir_r(const char *const pathname) /// Create a directory, making leading components first if necessary int mkdir_r(const char *const pathname) { + if (!pathname) + return -1; + const size_t len = static_cast<size_t>(strlen(pathname)); char *tmp = new char[len + 2]; char *p; diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index dd045cb5a..dbbdf6b31 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -39,6 +39,12 @@ #include <limits.h> #endif +#ifdef ANDROID +#ifdef USE_SDL2 +#include <SDL_system.h> +#endif +#endif + #include "debug.h" std::string getRealPath(const std::string &str) @@ -175,3 +181,10 @@ std::string getDesktopDir() return std::string(PhysFs::getUserDir()).append("Desktop"); #endif } + +#ifdef ANDROID +std::string getSdStoragePath() +{ + return getenv("DATADIR2"); +} +#endif diff --git a/src/utils/paths.h b/src/utils/paths.h index 0c36b2f66..6e2d17808 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -39,4 +39,8 @@ std::string getSelfName() A_WARN_UNUSED; std::string getDesktopDir() A_WARN_UNUSED; +#ifdef ANDROID +std::string getSdStoragePath() A_WARN_UNUSED; +#endif + #endif // UTILS_PATHS_H diff --git a/src/utils/process.cpp b/src/utils/process.cpp index 1859b1c2f..efd799987 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -238,10 +238,16 @@ bool openBrowser(std::string url) } #elif defined ANDROID #include "utils/stringutils.h" +#ifndef USE_SDL2 #include <SDL_screenkeyboard.h> +#endif bool openBrowser(std::string url) { +#ifdef USE_SDL2 + // +++ need add support +#else SDL_ANDROID_OpenBrowser(replaceAll(url, " ", "").c_str()); +#endif return true; } #elif defined __APPLE__ |