diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2011-06-12 20:26:28 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:19:32 +0300 |
| commit | 3496cc699022cc094767e9f0fd6c53594dedc018 (patch) | |
| tree | 114f2d94ac97441b3131443533af75aecdd45e58 /platform | |
| parent | 1b4276e965aaf381b674d94e8ab631b4355bbd07 (diff) | |
[android] Fixes for static lib toolchain support
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/platform.pro | 2 | ||||
| -rw-r--r-- | platform/preferred_languages.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/platform.pro b/platform/platform.pro index 201d86856a..d557e9ea96 100644 --- a/platform/platform.pro +++ b/platform/platform.pro @@ -11,7 +11,7 @@ include($$ROOT_DIR/common.pri) QT *= core network -!iphone* { +!iphone*:!android* { INCLUDEPATH += $$ROOT_DIR/3party/jansson/src SOURCES += \ diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp index add03ab205..4f46fb07e1 100644 --- a/platform/preferred_languages.cpp +++ b/platform/preferred_languages.cpp @@ -19,6 +19,9 @@ #elif defined(OMIM_OS_LINUX) #include "../std/stdlib.hpp" +#elif defined(OMIM_OS_ANDROID) + /// @TODO + #else #error "Define language preferences for your platform" @@ -151,6 +154,9 @@ void SystemPreferredLanguages(vector<string> & languages) else if ((p = getenv("LANG"))) languages.push_back(p); +#elif defined(OMIM_OS_ANDROID) + /// @TODO + #else #error "Define language preferences for your platform" #endif |