summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-16 00:34:21 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-16 00:34:21 +0300
commit6bbe09af6faa77df40112e7cf876877ef11ce74b (patch)
treede5ed5f00b34daa9c6cc268fdaacead00b7e7e85
parentc3434fa53d1c83bc65b640951364f842fe6c79f4 (diff)
parent2ed0917b4ee942ff55639500f846ae9cb4f48b90 (diff)
downloadmv-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.gz
mv-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.bz2
mv-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.xz
mv-6bbe09af6faa77df40112e7cf876877ef11ce74b.zip
Merge branch 'androidtemp'
Conflicts: configure.ac
-rwxr-xr-xconfigure.ac18
-rw-r--r--src/client.cpp5
-rw-r--r--src/main.h4
3 files changed, 18 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 56d28c307..a4e9f68f0 100755
--- a/configure.ac
+++ b/configure.ac
@@ -50,8 +50,10 @@ AC_ARG_WITH(pthread,[ --without-pthread don't check for pthread ] )
if test "x$with_pthread" == "xno"; then
without_pthread=yes
else
- AC_CHECK_LIB([pthread], [pthread_create], ,
- AC_MSG_ERROR([ *** Unable to find pthread library]))
+ if test "x$androidbuild_enabled" == "xfalse"; then
+ AC_CHECK_LIB([pthread], [pthread_create], ,
+ AC_MSG_ERROR([ *** Unable to find pthread library]))
+ fi
withoud_pthread=no
fi
@@ -188,7 +190,11 @@ AC_ARG_WITH(internalguichan,[ --without-mumble don't use mumble integrat
if test "x$with_mumble" == "xno"; then
with_mumble=no
else
- with_mumble=yes
+ if test "x$androidbuild_enabled" == "xfalse"; then
+ with_mumble=yes
+ else
+ with_mumble=no
+ fi
fi
AM_CONDITIONAL(USE_MUMBLE, test x$with_mumble = xyes)
@@ -201,8 +207,10 @@ if test "x$with_librt" == "xno"; then
without_librt=yes
else
if test "x$applebuild_enabled" == "xfalse"; then
- AC_CHECK_LIB(rt, shm_open, ,
- AC_MSG_ERROR([ *** Unable to find librt library]))
+ if test "x$androidbuild_enabled" == "xfalse"; then
+ AC_CHECK_LIB(rt, shm_open, ,
+ AC_MSG_ERROR([ *** Unable to find librt library]))
+ fi
fi
without_librt=no
fi
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