diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-16 00:34:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-16 00:34:21 +0300 |
| commit | 6bbe09af6faa77df40112e7cf876877ef11ce74b (patch) | |
| tree | de5ed5f00b34daa9c6cc268fdaacead00b7e7e85 /src | |
| parent | c3434fa53d1c83bc65b640951364f842fe6c79f4 (diff) | |
| parent | 2ed0917b4ee942ff55639500f846ae9cb4f48b90 (diff) | |
| download | manaplus-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.gz manaplus-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.bz2 manaplus-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.xz manaplus-6bbe09af6faa77df40112e7cf876877ef11ce74b.zip | |
Merge branch 'androidtemp'
Conflicts:
configure.ac
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 5 | ||||
| -rw-r--r-- | src/main.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp index 12a50b45d..cfc19446b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1673,6 +1673,8 @@ void Client::initLocalDataDir() if (mLocalDataDir.empty()) mLocalDataDir = std::string(PHYSFS_getUserDir()); mLocalDataDir += "/Mana"; +#elif defined __ANDROID__ + mLocalDataDir = "local"; #else mLocalDataDir = std::string(PHYSFS_getUserDir()) + ".local/share/mana"; @@ -1717,8 +1719,7 @@ void Client::initConfigDir() else mConfigDir += "/mana/" + branding.getValue("appShort", "mana"); #elif defined __ANDROID__ - mConfigDir = "/mnt/sdcard/Android/data/org.evolonline.manaplus" - "/config/" + branding.getValue("appShort", "mana"); + mConfigDir = "config"; #else mConfigDir = std::string(PHYSFS_getUserDir()) + "/.config/mana/" + branding.getValue("appShort", "mana"); diff --git a/src/main.h b/src/main.h index 486635340..8c29e1097 100644 --- a/src/main.h +++ b/src/main.h @@ -64,6 +64,8 @@ #define PACKAGE_OS "NetBSD" #elif defined __OpenBSD__ #define PACKAGE_OS "OpenBSD" +#elif defined(__ANDROID__) || defined(ANDROID) +#define PACKAGE_OS "Android" #elif defined __linux__ || defined __linux #define PACKAGE_OS "Linux" #elif defined __GNU__ @@ -74,8 +76,6 @@ || defined WIN64 || defined _WIN64 || defined __WIN64__ \ || defined __MINGW32__ || defined _MSC_VER #define PACKAGE_OS "Windows" -#elif defined(__ANDROID__) || defined(ANDROID) -#define PACKAGE_OS "Android" #else #define PACKAGE_OS "Other" #endif |