diff options
| author | sapier <Sapier at GMX dot net> | 2014-10-01 22:18:29 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-10-01 22:18:29 +0200 |
| commit | b37bff72f17c46b3bf6ba55a4084edf58bd3df78 (patch) | |
| tree | 30f0611df296a7bd7af3e0cc9b87d6c289ab7632 | |
| parent | 47abe25fe7d87ef3f15ec8d1e5a9ece51819a606 (diff) | |
| download | minetest-b37bff72f17c46b3bf6ba55a4084edf58bd3df78.tar.gz minetest-b37bff72f17c46b3bf6ba55a4084edf58bd3df78.tar.bz2 minetest-b37bff72f17c46b3bf6ba55a4084edf58bd3df78.zip | |
Fix android build using hardcoded path for data instead of using the one fetched by android api on init.
Fix android missing version information
| -rw-r--r-- | src/config.h | 5 | ||||
| -rw-r--r-- | src/porting.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/config.h b/src/config.h index 510c5ef1e..f1aef03aa 100644 --- a/src/config.h +++ b/src/config.h @@ -74,5 +74,10 @@ #define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING #endif +#ifdef __ANDROID__ + #include "android_version.h" + #define VERSION_STRING CMAKE_VERSION_STRING +#endif + #endif diff --git a/src/porting.cpp b/src/porting.cpp index ad942b0bc..2fc5d0364 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -480,7 +480,7 @@ void initializePaths() bindir + DIR_DELIM + ".." + DIR_DELIM + "share" + DIR_DELIM + PROJECT_NAME); trylist.push_back(bindir + DIR_DELIM + ".."); #ifdef __ANDROID__ - trylist.push_back(DIR_DELIM "sdcard" DIR_DELIM PROJECT_NAME); + trylist.push_back(path_user); #endif for(std::list<std::string>::const_iterator i = trylist.begin(); @@ -502,8 +502,6 @@ void initializePaths() } #ifndef __ANDROID__ path_user = std::string(getenv("HOME")) + DIR_DELIM + "." + PROJECT_NAME; -#else - path_user = std::string(DIR_DELIM "sdcard" DIR_DELIM PROJECT_NAME DIR_DELIM); #endif /* |