Merge remote-tracking branch 'origin/feature/develop-and' into develop

Add support android build
This commit is contained in:
Oleg Korshul
2020-04-19 15:37:56 +03:00
11 changed files with 195 additions and 33 deletions

View File

@ -22,10 +22,16 @@ core_ios {
CONFIG += bundle_dylibs
}
include(../Common/3dParty/icu/icu.pri)
core_android {
CONFIG += core_disable_icu
SOURCES += UnicodeConverter_internal_android.cpp
}
!core_disable_icu {
include(../Common/3dParty/icu/icu.pri)
SOURCES += \
UnicodeConverter.cpp
UnicodeConverter.cpp
HEADERS +=\
UnicodeConverter.h