minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Fix android build using hardcoded path for data instead of using the one fetched by android api on init. 

Fix android missing version information
pull/1535/head
sapier 2014-10-01 22:18:29 +02:00
parent 47abe25fe7
commit b37bff72f1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.h
View File

@ -74,5 +74,10 @@
#define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING #define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING
#endif #endif
#ifdef __ANDROID__
#include "android_version.h"
#define VERSION_STRING CMAKE_VERSION_STRING
#endif
#endif #endif

4
src/porting.cpp
View File

@ -480,7 +480,7 @@ void initializePaths()
bindir + DIR_DELIM + ".." + DIR_DELIM + "share" + DIR_DELIM + PROJECT_NAME); bindir + DIR_DELIM + ".." + DIR_DELIM + "share" + DIR_DELIM + PROJECT_NAME);
trylist.push_back(bindir + DIR_DELIM + ".."); trylist.push_back(bindir + DIR_DELIM + "..");
#ifdef __ANDROID__ #ifdef __ANDROID__
trylist.push_back(DIR_DELIM "sdcard" DIR_DELIM PROJECT_NAME); trylist.push_back(path_user);
#endif #endif
for(std::list<std::string>::const_iterator i = trylist.begin(); for(std::list<std::string>::const_iterator i = trylist.begin();
@ -502,8 +502,6 @@ void initializePaths()
} }
#ifndef __ANDROID__ #ifndef __ANDROID__
path_user = std::string(getenv("HOME")) + DIR_DELIM + "." + PROJECT_NAME; 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 #endif
/* /*