Skip to content
Permalink
Browse files

Fix android build using hardcoded path for data instead of using the …

…one fetched by android api on init.

Fix android missing version information
  • Loading branch information
sapier sapier
sapier authored and sapier committed Oct 1, 2014
1 parent 47abe25 commit b37bff72f17c46b3bf6ba55a4084edf58bd3df78
Showing with 6 additions and 3 deletions.
  1. +5 −0 src/config.h
  2. +1 −3 src/porting.cpp
@@ -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

@@ -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

/*

0 comments on commit b37bff7

Please sign in to comment.
You can’t perform that action at this time.