diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-31 21:34:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-31 23:40:54 +0300 |
| commit | c60449fa25d76bd30668ae0de870d3897372b09b (patch) | |
| tree | e93ff901b5533c4759b6f26135abd808e9318b50 | |
| parent | 092b060edacfbb79df3dcf66d7b71b79813aeb45 (diff) | |
| download | plus-c60449fa25d76bd30668ae0de870d3897372b09b.tar.gz plus-c60449fa25d76bd30668ae0de870d3897372b09b.tar.bz2 plus-c60449fa25d76bd30668ae0de870d3897372b09b.tar.xz plus-c60449fa25d76bd30668ae0de870d3897372b09b.zip | |
Fix PKG_DATADIR and LOCALEDIR for Android.
| -rw-r--r-- | src/main.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 6626db6d9..33284e77b 100644 --- a/src/main.h +++ b/src/main.h @@ -58,14 +58,14 @@ #if defined __APPLE__ #define PACKAGE_OS "Apple" +#elif defined(__ANDROID__) || defined(ANDROID) +#define PACKAGE_OS "Android" #elif defined __FreeBSD__ || defined __DragonFly__ #define PACKAGE_OS "FreeBSD" #elif defined __NetBSD__ #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__ @@ -95,6 +95,16 @@ #define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS +#ifdef ANDROID +#ifdef PKG_DATADIR +#undef PKG_DATADIR +#endif +#ifdef LOCALEDIR +#undef LOCALEDIR +#endif +#define LOCALEDIR "locale" +#endif + #ifndef PKG_DATADIR #define PKG_DATADIR "" #endif |